USB: chipidea: i.MX: simplify usbmisc

[karo-tx-linux.git] / drivers / usb / chipidea / ci_hdrc_imx.c

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index cc53e63c9ce9390b4f86e018b40bf8d7ae1fcedd..74d998d9b45b28001e2f15f6026640ecb6e07085 100644 (file)
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -27,57 +27,48 @@ struct ci_hdrc_imx_data {
        struct usb_phy *phy;
        struct platform_device *ci_pdev;
        struct clk *clk;
+       struct imx_usbmisc_data *usbmisc_data;
 };
 
-static const struct usbmisc_ops *usbmisc_ops;
-
 /* Common functions shared by usbmisc drivers */
 
-int usbmisc_set_ops(const struct usbmisc_ops *ops)
-{
-       if (usbmisc_ops)
-               return -EBUSY;
-
-       usbmisc_ops = ops;
-
-       return 0;
-}
-EXPORT_SYMBOL_GPL(usbmisc_set_ops);
-
-void usbmisc_unset_ops(const struct usbmisc_ops *ops)
-{
-       usbmisc_ops = NULL;
-}
-EXPORT_SYMBOL_GPL(usbmisc_unset_ops);
-
-int usbmisc_get_init_data(struct device *dev, struct usbmisc_usb_device *usbdev)
+static struct imx_usbmisc_data *usbmisc_get_init_data(struct device *dev)
 {
        struct device_node *np = dev->of_node;
        struct of_phandle_args args;
+       struct imx_usbmisc_data *data;
        int ret;
 
-       usbdev->dev = dev;
+       /*
+        * In case the fsl,usbmisc property is not present this device doesn't
+        * need usbmisc. Return NULL (which is no error here)
+        */
+       if (!of_get_property(np, "fsl,usbmisc", NULL))
+               return NULL;
+
+       data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+       if (!data)
+               return ERR_PTR(-ENOMEM);
 
        ret = of_parse_phandle_with_args(np, "fsl,usbmisc", "#index-cells",
                                        0, &args);
        if (ret) {
                dev_err(dev, "Failed to parse property fsl,usbmisc, errno %d\n",
                        ret);
-               memset(usbdev, 0, sizeof(*usbdev));
-               return ret;
+               return ERR_PTR(ret);
        }
-       usbdev->index = args.args[0];
+
+       data->index = args.args[0];
        of_node_put(args.np);
 
        if (of_find_property(np, "disable-over-current", NULL))
-               usbdev->disable_oc = 1;
+               data->disable_oc = 1;
 
        if (of_find_property(np, "external-vbus-divider", NULL))
-               usbdev->evdo = 1;
+               data->evdo = 1;
 
-       return 0;
+       return data;
 }
-EXPORT_SYMBOL_GPL(usbmisc_get_init_data);
 
 /* End of common functions shared by usbmisc drivers*/
 
@@ -92,16 +83,16 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
        };
        int ret;
 
-       if (of_find_property(pdev->dev.of_node, "fsl,usbmisc", NULL)
-               && !usbmisc_ops)
-               return -EPROBE_DEFER;
-
        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
        if (!data) {
                dev_err(&pdev->dev, "Failed to allocate ci_hdrc-imx data!\n");
                return -ENOMEM;
        }
 
+       data->usbmisc_data = usbmisc_get_init_data(&pdev->dev);
+       if (IS_ERR(data->usbmisc_data))
+               return PTR_ERR(data->usbmisc_data);
+
        data->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(data->clk)) {
                dev_err(&pdev->dev,
@@ -135,11 +126,11 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
        if (!pdev->dev.coherent_dma_mask)
                pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
 
-       if (usbmisc_ops && usbmisc_ops->init) {
-               ret = usbmisc_ops->init(&pdev->dev);
+       if (data->usbmisc_data) {
+               ret = imx_usbmisc_init(data->usbmisc_data);
                if (ret) {
-                       dev_err(&pdev->dev,
-                               "usbmisc init failed, ret=%d\n", ret);
+                       dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n",
+                                       ret);
                        goto err_clk;
                }
        }
@@ -155,11 +146,11 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
                goto err_clk;
        }
 
-       if (usbmisc_ops && usbmisc_ops->post) {
-               ret = usbmisc_ops->post(&pdev->dev);
+       if (data->usbmisc_data) {
+               ret = imx_usbmisc_init_post(data->usbmisc_data);
                if (ret) {
-                       dev_err(&pdev->dev,
-                               "usbmisc post failed, ret=%d\n", ret);
+                       dev_err(&pdev->dev, "usbmisc post failed, ret=%d\n",
+                                       ret);
                        goto disable_device;
                }
        }