firmware: imx: Introduce imx_dsp_setup_channels

Create a separate function that sets up DSP mailbox channels
so that imx_dsp_probe function will be easier to read.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Paul Olaru <paul.olaru@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/drivers/firmware/imx/imx-dsp.c b/drivers/firmware/imx/imx-dsp.c
index 4265e9d..a3a018c 100644 (file)
--- a/drivers/firmware/imx/imx-dsp.c
+++ b/drivers/firmware/imx/imx-dsp.c
@@ -60,22 +60,15 @@ static void imx_dsp_handle_rx(struct mbox_client *c, void *msg)
        }
 }
 
-static int imx_dsp_probe(struct platform_device *pdev)
+static int imx_dsp_setup_channels(struct imx_dsp_ipc *dsp_ipc)
 {
-       struct device *dev = &pdev->dev;
-       struct imx_dsp_ipc *dsp_ipc;
+       struct device *dev = dsp_ipc->dev;
        struct imx_dsp_chan *dsp_chan;
        struct mbox_client *cl;
        char *chan_name;
        int ret;
        int i, j;
 
-       device_set_of_node_from_dev(&pdev->dev, pdev->dev.parent);
-
-       dsp_ipc = devm_kzalloc(dev, sizeof(*dsp_ipc), GFP_KERNEL);
-       if (!dsp_ipc)
-               return -ENOMEM;
-
        for (i = 0; i < DSP_MU_CHAN_NUM; i++) {
                if (i < 2)
                        chan_name = kasprintf(GFP_KERNEL, "txdb%d", i);
@@ -108,12 +101,6 @@ static int imx_dsp_probe(struct platform_device *pdev)
                kfree(chan_name);
        }
 
-       dsp_ipc->dev = dev;
-
-       dev_set_drvdata(dev, dsp_ipc);
-
-       dev_info(dev, "NXP i.MX DSP IPC initialized\n");
-
        return 0;
 out:
        kfree(chan_name);
@@ -125,6 +112,30 @@ out:
        return ret;
 }
 
+static int imx_dsp_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct imx_dsp_ipc *dsp_ipc;
+       int ret;
+
+       device_set_of_node_from_dev(&pdev->dev, pdev->dev.parent);
+
+       dsp_ipc = devm_kzalloc(dev, sizeof(*dsp_ipc), GFP_KERNEL);
+       if (!dsp_ipc)
+               return -ENOMEM;
+
+       dsp_ipc->dev = dev;
+       dev_set_drvdata(dev, dsp_ipc);
+
+       ret = imx_dsp_setup_channels(dsp_ipc);
+       if (ret < 0)
+               return ret;
+
+       dev_info(dev, "NXP i.MX DSP IPC initialized\n");
+
+       return 0;
+}
+
 static int imx_dsp_remove(struct platform_device *pdev)
 {
        struct imx_dsp_chan *dsp_chan;