@@ -404,14 +404,13 @@ static const struct hc_driver ehci_omap_hc_driver;
/* always called with process context; sleeping is OK */
/**
- * ehci_hcd_omap_drv_probe - initialize TI-based HCDs
- * Context: !in_interrupt()
+ * ehci_hcd_omap_probe - initialize TI-based HCDs
*
* Allocates basic resources for this USB host controller, and
* then invokes the start() method for the HCD associated with it
* through the hotplug entry's driver_data.
*/
-static int ehci_hcd_omap_drv_probe(struct platform_device *pdev)
+static int ehci_hcd_omap_probe(struct platform_device *pdev)
{
struct ehci_hcd *ehci;
struct resource *res;
@@ -484,22 +483,18 @@ err_disabled:
return ret;
}
-/*-------------------------------------------------------------------------*/
-
/* may be called without controller electrically present */
/* may be called with controller, bus, and devices active */
/**
- * ehci_hcd_omap_drv_remove - shutdown processing for EHCI HCDs
+ * ehci_hcd_omap_remove - shutdown processing for EHCI HCDs
* @pdev: USB Host Controller being removed
- * Context: !in_interrupt()
*
* Reverses the effect of usb_ehci_hcd_omap_probe(), first invoking
* the HCD's stop() method. It is always called from a thread
* context, normally "rmmod", "apmd", or something similar.
- *
*/
-static int ehci_hcd_omap_drv_remove(struct platform_device *pdev)
+static int ehci_hcd_omap_remove(struct platform_device *pdev)
{
struct usb_hcd *hcd = platform_get_drvdata(pdev);
@@ -512,17 +507,18 @@ static int ehci_hcd_omap_drv_remove(struct platform_device *pdev)
}
static struct platform_driver ehci_hcd_omap_driver = {
- .probe = ehci_hcd_omap_drv_probe,
- .remove = ehci_hcd_omap_drv_remove,
+ .probe = ehci_hcd_omap_probe,
+ .remove = ehci_hcd_omap_remove,
.shutdown = usb_hcd_platform_shutdown,
- /*.suspend = ehci_hcd_omap_drv_suspend, */
- /*.resume = ehci_hcd_omap_drv_resume, */
+ /*.suspend = ehci_hcd_omap_suspend, */
+ /*.resume = ehci_hcd_omap_resume, */
.driver = {
.name = "ehci-omap",
- .bus = &platform_bus_type
}
};
+/*-------------------------------------------------------------------------*/
+
static const struct hc_driver ehci_omap_hc_driver = {
.description = hcd_name,
.product_desc = "OMAP-EHCI Host Controller",
The "drv" in the function names was there just to make it bigger, remove it so we have 4 characters smaller lines. Also remove the platform_bus_type from platform_driver since platform_driver_register() already does that. Signed-off-by: Felipe Balbi <me@felipebalbi.com> --- drivers/usb/host/ehci-omap.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-)