Skip to content

Commit

Permalink
usb: chipidea: move debug files creation/removal to the core
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Shishkin authored and Greg Kroah-Hartman committed Mar 30, 2013
1 parent c8e333a commit adf0f73
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
6 changes: 5 additions & 1 deletion drivers/usb/chipidea/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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);
Expand Down
9 changes: 1 addition & 8 deletions drivers/usb/chipidea/udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -1725,8 +1721,6 @@ static int udc_start(struct ci13xxx *ci)
}

dev_err(dev, "error = %i\n", retval);
remove_dbg:
dbg_remove_files(ci);
unreg_device:
device_unregister(&ci->gadget.dev);
put_transceiver:
Expand Down Expand Up @@ -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));
Expand Down

0 comments on commit adf0f73

Please sign in to comment.