summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/otg/fsl_otg.c41
-rw-r--r--drivers/usb/otg/otg_fsm.c2
2 files changed, 3 insertions, 40 deletions
diff --git a/drivers/usb/otg/fsl_otg.c b/drivers/usb/otg/fsl_otg.c
index de188bea0969..f632c60e91d8 100644
--- a/drivers/usb/otg/fsl_otg.c
+++ b/drivers/usb/otg/fsl_otg.c
@@ -21,7 +21,7 @@
#include <linux/usb.h>
#include <linux/platform_device.h>
#include <linux/usb/ch9.h>
-#include <linux/usb_gadget.h>
+#include <linux/usb/gadget.h>
#include <linux/time.h>
#include <asm/io.h>
@@ -63,43 +63,6 @@ static struct fsl_otg_config fsl_otg_initdata = {
.otg_port = 1,
};
-/**
- * usb_bus_start_enum - start immediate enumeration (for OTG)
- * @bus: the bus (must use hcd framework)
- * @port: 1-based number of port; usually bus->otg_port
- * Context: in_interrupt()
- *
- * Starts enumeration, with an immediate reset followed later by
- * khubd identifying and possibly configuring the device.
- * This is needed by OTG controller drivers, where it helps meet
- * HNP protocol timing requirements for starting a port reset.
- */
-
-#include "../../../drivers/usb/core/hcd.h"
-
-int usb_bus_start_enum(struct usb_bus *bus, unsigned port_num)
-{
- struct usb_hcd *hcd;
- int status = -EOPNOTSUPP;
-
- /* NOTE: since HNP can't start by grabbing the bus's address0_sem,
- * boards with root hubs hooked up to internal devices (instead of
- * just the OTG port) may need more attention to resetting...
- */
-
- hcd = container_of(bus, struct usb_hcd, self);
- if (port_num && hcd->driver->start_port_reset)
- status = hcd->driver->start_port_reset(hcd, port_num);
-
- /* run khubd shortly after (first) root port reset finishes;
- * it may issue others, until at least 50 msecs have passed.
- */
- if (status == 0)
- mod_timer(&hcd->rh_timer, jiffies + msecs_to_jiffies(10));
-
- return status;
-}
-
#if defined(CONFIG_ISP1504_MXC)
int write_ulpi(u8 addr, u8 data)
{
@@ -1013,7 +976,7 @@ static int __init fsl_otg_probe(struct platform_device *pdev)
return status;
}
-static int __exit fsl_otg_remove(struct platform_device *pdev)
+static int fsl_otg_remove(struct platform_device *pdev)
{
u32 ie;
struct fsl_usb2_platform_data *pdata;
diff --git a/drivers/usb/otg/otg_fsm.c b/drivers/usb/otg/otg_fsm.c
index cde342d5ec17..62edd6810374 100644
--- a/drivers/usb/otg/otg_fsm.c
+++ b/drivers/usb/otg/otg_fsm.c
@@ -17,7 +17,7 @@
#include <linux/spinlock.h>
#include <linux/delay.h>
#include <linux/usb.h>
-#include <linux/usb_gadget.h>
+#include <linux/usb/gadget.h>
#include "otg_fsm.h"