usb: chipidea: move debug files creation/removal to the core

Create and remove debugfs entries in hdrc probe/remove instead of
start/stop of the device controller. Gadget specific will not export
anything while the controller is in host mode.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 6 insertions, 9 deletions

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 5270156591e0..a7ce1b8c8fd7 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -455,8 +455,11 @@ static int ci_hdrc_probe(struct platform_device *pdev)
         if (ci->is_otg)
                 hw_write(ci, OP_OTGSC, OTGSC_IDIE, OTGSC_IDIE);
 
-        return ret;
+        ret = dbg_create_files(ci);
+        if (!ret)
+                return 0;
 
+        free_irq(ci->irq, ci);
 stop:
         ci_role_stop(ci);
 rm_wq:
@@ -470,6 +473,7 @@ static int ci_hdrc_remove(struct platform_device *pdev)
 {
         struct ci13xxx *ci = platform_get_drvdata(pdev);
 
+        dbg_remove_files(ci);
         flush_workqueue(ci->wq);
         destroy_workqueue(ci->wq);
         free_irq(ci->irq, ci);
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index d945391e3c6c..28c31baebfde 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1697,15 +1697,11 @@ static int udc_start(struct ci13xxx *ci)
                 goto put_transceiver;
         }
 
-        retval = dbg_create_files(ci);
-        if (retval)
-                goto unreg_device;
-
         if (!IS_ERR_OR_NULL(ci->transceiver)) {
                 retval = otg_set_peripheral(ci->transceiver->otg,
                                                 &ci->gadget);
                 if (retval)
-                        goto remove_dbg;
+                        goto unreg_device;
         }
 
         retval = usb_add_gadget_udc(dev, &ci->gadget);
@@ -1725,8 +1721,6 @@ remove_trans:
         }
 
         dev_err(dev, "error = %i\n", retval);
-remove_dbg:
-        dbg_remove_files(ci);
 unreg_device:
         device_unregister(&ci->gadget.dev);
 put_transceiver:
@@ -1763,7 +1757,6 @@ static void udc_stop(struct ci13xxx *ci)
                 if (ci->global_phy)
                         usb_put_phy(ci->transceiver);
         }
-        dbg_remove_files(ci);
         device_unregister(&ci->gadget.dev);
         /* my kobject is dynamic, I swear! */
         memset(&ci->gadget, 0, sizeof(ci->gadget));