1 files changed, 22 insertions, 25 deletions

diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
index e086630e41a9..fd0f6c5dfbc1 100644
--- a/drivers/usb/mtu3/mtu3_plat.c
+++ b/drivers/usb/mtu3/mtu3_plat.c
@@ -16,6 +16,7 @@
 
 #include "mtu3.h"
 #include "mtu3_dr.h"
+#include "mtu3_debug.h"
 
 /* u2-port0 should be powered on and enabled; */
 int ssusb_check_clocks(struct ssusb_mtk *ssusb, u32 ex_clks)
@@ -210,30 +211,16 @@ static void ssusb_ip_sw_reset(struct ssusb_mtk *ssusb)
         mtu3_setbits(ssusb->ippc_base, U3D_SSUSB_IP_PW_CTRL2, SSUSB_IP_DEV_PDN);
 }
 
-/* ignore the error if the clock does not exist */
-static struct clk *get_optional_clk(struct device *dev, const char *id)
-{
-        struct clk *opt_clk;
-
-        opt_clk = devm_clk_get(dev, id);
-        /* ignore error number except EPROBE_DEFER */
-        if (IS_ERR(opt_clk) && (PTR_ERR(opt_clk) != -EPROBE_DEFER))
-                opt_clk = NULL;
-
-        return opt_clk;
-}
-
 static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
 {
         struct device_node *node = pdev->dev.of_node;
         struct otg_switch_mtk *otg_sx = &ssusb->otg_switch;
         struct device *dev = &pdev->dev;
-        struct regulator *vbus;
         struct resource *res;
         int i;
         int ret;
 
-        ssusb->vusb33 = devm_regulator_get(&pdev->dev, "vusb33");
+        ssusb->vusb33 = devm_regulator_get(dev, "vusb33");
         if (IS_ERR(ssusb->vusb33)) {
                 dev_err(dev, "failed to get vusb33\n");
                 return PTR_ERR(ssusb->vusb33);
@@ -245,15 +232,15 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
                 return PTR_ERR(ssusb->sys_clk);
         }
 
-        ssusb->ref_clk = get_optional_clk(dev, "ref_ck");
+        ssusb->ref_clk = devm_clk_get_optional(dev, "ref_ck");
         if (IS_ERR(ssusb->ref_clk))
                 return PTR_ERR(ssusb->ref_clk);
 
-        ssusb->mcu_clk = get_optional_clk(dev, "mcu_ck");
+        ssusb->mcu_clk = devm_clk_get_optional(dev, "mcu_ck");
         if (IS_ERR(ssusb->mcu_clk))
                 return PTR_ERR(ssusb->mcu_clk);
 
-        ssusb->dma_clk = get_optional_clk(dev, "dma_ck");
+        ssusb->dma_clk = devm_clk_get_optional(dev, "dma_ck");
         if (IS_ERR(ssusb->dma_clk))
                 return PTR_ERR(ssusb->dma_clk);
 
@@ -286,7 +273,7 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
                 ssusb->dr_mode = USB_DR_MODE_OTG;
 
         if (ssusb->dr_mode == USB_DR_MODE_PERIPHERAL)
-                return 0;
+                goto out;
 
         /* if host role is supported */
         ret = ssusb_wakeup_of_property_parse(ssusb, node);
@@ -299,15 +286,14 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
         of_property_read_u32(node, "mediatek,u3p-dis-msk",
                              &ssusb->u3p_dis_msk);
 
-        vbus = devm_regulator_get(&pdev->dev, "vbus");
-        if (IS_ERR(vbus)) {
+        otg_sx->vbus = devm_regulator_get(dev, "vbus");
+        if (IS_ERR(otg_sx->vbus)) {
                 dev_err(dev, "failed to get vbus\n");
-                return PTR_ERR(vbus);
+                return PTR_ERR(otg_sx->vbus);
         }
-        otg_sx->vbus = vbus;
 
         if (ssusb->dr_mode == USB_DR_MODE_HOST)
-                return 0;
+                goto out;
 
         /* if dual-role mode is supported */
         otg_sx->is_u3_drd = of_property_read_bool(node, "mediatek,usb3-drd");
@@ -322,6 +308,7 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
                 }
         }
 
+out:
         dev_info(dev, "dr_mode: %d, is_u3_dr: %d, u3p_dis_msk: %x, drd: %s\n",
                 ssusb->dr_mode, otg_sx->is_u3_drd, ssusb->u3p_dis_msk,
                 otg_sx->manual_drd_enabled ? "manual" : "auto");
@@ -354,6 +341,8 @@ static int mtu3_probe(struct platform_device *pdev)
         if (ret)
                 return ret;
 
+        ssusb_debugfs_create_root(ssusb);
+
         /* enable power domain */
         pm_runtime_enable(dev);
         pm_runtime_get_sync(dev);
@@ -401,7 +390,11 @@ static int mtu3_probe(struct platform_device *pdev)
                         goto gadget_exit;
                 }
 
-                ssusb_otg_switch_init(ssusb);
+                ret = ssusb_otg_switch_init(ssusb);
+                if (ret) {
+                        dev_err(dev, "failed to initialize switch\n");
+                        goto host_exit;
+                }
                 break;
         default:
                 dev_err(dev, "unsupported mode: %d\n", ssusb->dr_mode);
@@ -411,6 +404,8 @@ static int mtu3_probe(struct platform_device *pdev)
 
         return 0;
 
+host_exit:
+        ssusb_host_exit(ssusb);
 gadget_exit:
         ssusb_gadget_exit(ssusb);
 comm_exit:
@@ -418,6 +413,7 @@ comm_exit:
 comm_init_err:
         pm_runtime_put_sync(dev);
         pm_runtime_disable(dev);
+        ssusb_debugfs_remove_root(ssusb);
 
         return ret;
 }
@@ -445,6 +441,7 @@ static int mtu3_remove(struct platform_device *pdev)
         ssusb_rscs_exit(ssusb);
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
+        ssusb_debugfs_remove_root(ssusb);
 
         return 0;
 }