USB: EHCI: export ehci_handshake for ehci-hcd sub-drivers

In order to split ehci-hcd.c into separate modules, handshake() must be
exported. Rename the symbol to add an ehci_ prefix, to avoid any naming
clashes.

Signed-off-by: Manjunath Goudar <manjunath.goudar@linaro.org>
[swarren, split Manjunath's patches more logically, limit this change
to export just handshake()]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 246e124e6ac55c3dc66ba822a9b3f8ba5bebdd6a..e8a6f3dd73570f348ea73affad6bf4af1ae01e09 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -139,7 +139,7 @@ static inline unsigned ehci_read_frame_index(struct ehci_hcd *ehci)
 /*-------------------------------------------------------------------------*/
 
 /*
- * handshake - spin reading hc until handshake completes or fails
+ * ehci_handshake - spin reading hc until handshake completes or fails
  * @ptr: address of hc register to be read
  * @mask: bits to look at in result of read
  * @done: value of those bits when handshake succeeds
@@ -155,8 +155,8 @@ static inline unsigned ehci_read_frame_index(struct ehci_hcd *ehci)
  * before driver shutdown. But it also seems to be caused by bugs in cardbus
  * bridge shutdown:  shutting down the bridge before the devices using it.
  */
-static int handshake (struct ehci_hcd *ehci, void __iomem *ptr,
-                     u32 mask, u32 done, int usec)
+int ehci_handshake(struct ehci_hcd *ehci, void __iomem *ptr,
+                  u32 mask, u32 done, int usec)
 {
        u32     result;
 
@@ -172,6 +172,7 @@ static int handshake (struct ehci_hcd *ehci, void __iomem *ptr,
        } while (usec > 0);
        return -ETIMEDOUT;
 }
+EXPORT_SYMBOL_GPL(ehci_handshake);
 
 /* check TDI/ARC silicon is in host mode */
 static int tdi_in_host_mode (struct ehci_hcd *ehci)
@@ -212,7 +213,7 @@ static int ehci_halt (struct ehci_hcd *ehci)
        spin_unlock_irq(&ehci->lock);
        synchronize_irq(ehci_to_hcd(ehci)->irq);
 
-       return handshake(ehci, &ehci->regs->status,
+       return ehci_handshake(ehci, &ehci->regs->status,
                          STS_HALT, STS_HALT, 16 * 125);
 }
 
@@ -251,7 +252,7 @@ static int ehci_reset (struct ehci_hcd *ehci)
        ehci_writel(ehci, command, &ehci->regs->command);
        ehci->rh_state = EHCI_RH_HALTED;
        ehci->next_statechange = jiffies;
-       retval = handshake (ehci, &ehci->regs->command,
+       retval = ehci_handshake(ehci, &ehci->regs->command,
                            CMD_RESET, 0, 250 * 1000);
 
        if (ehci->has_hostpc) {
@@ -286,7 +287,8 @@ static void ehci_quiesce (struct ehci_hcd *ehci)
 
        /* wait for any schedule enables/disables to take effect */
        temp = (ehci->command << 10) & (STS_ASS | STS_PSS);
-       handshake(ehci, &ehci->regs->status, STS_ASS | STS_PSS, temp, 16 * 125);
+       ehci_handshake(ehci, &ehci->regs->status, STS_ASS | STS_PSS, temp,
+                       16 * 125);
 
        /* then disable anything that's still active */
        spin_lock_irq(&ehci->lock);
@@ -295,7 +297,8 @@ static void ehci_quiesce (struct ehci_hcd *ehci)
        spin_unlock_irq(&ehci->lock);
 
        /* hardware can take 16 microframes to turn off ... */
-       handshake(ehci, &ehci->regs->status, STS_ASS | STS_PSS, 0, 16 * 125);
+       ehci_handshake(ehci, &ehci->regs->status, STS_ASS | STS_PSS, 0,
+                       16 * 125);
 }
 
 /*-------------------------------------------------------------------------*/

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index b2f64506840bea5795bc3192d62fbf47e58e0af8..2b702772d04d3353cc570c340f04c9701fa11210 100644 (file)
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -892,7 +892,7 @@ static int ehci_hub_control (
                                                PORT_SUSPEND | PORT_RESUME);
                                ehci_writel(ehci, temp, status_reg);
                                clear_bit(wIndex, &ehci->resuming_ports);
-                               retval = handshake(ehci, status_reg,
+                               retval = ehci_handshake(ehci, status_reg,
                                           PORT_RESUME, 0, 2000 /* 2msec */);
                                if (retval != 0) {
                                        ehci_err(ehci,
@@ -918,7 +918,7 @@ static int ehci_hub_control (
                        /* REVISIT:  some hardware needs 550+ usec to clear
                         * this bit; seems too long to spin routinely...
                         */
-                       retval = handshake(ehci, status_reg,
+                       retval = ehci_handshake(ehci, status_reg,
                                        PORT_RESET, 0, 1000);
                        if (retval != 0) {
                                ehci_err (ehci, "port %d reset error %d\n",

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 8390c870299acddaaeaead6588a3e2c347999240..289b9b83f6bec40c1e4a1902d09fa98dab97f1d1 100644 (file)
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -179,7 +179,7 @@ static int tegra_ehci_hub_control(
                 * If a transaction is in progress, there may be a delay in
                 * suspending the port. Poll until the port is suspended.
                 */
-               if (handshake(ehci, status_reg, PORT_SUSPEND,
+               if (ehci_handshake(ehci, status_reg, PORT_SUSPEND,
                                                PORT_SUSPEND, 5000))
                        pr_err("%s: timeout waiting for SUSPEND\n", __func__);
 
@@ -227,9 +227,9 @@ static int tegra_ehci_hub_control(
                spin_lock_irqsave(&ehci->lock, flags);
 
                /* Poll until the controller clears RESUME and SUSPEND */
-               if (handshake(ehci, status_reg, PORT_RESUME, 0, 2000))
+               if (ehci_handshake(ehci, status_reg, PORT_RESUME, 0, 2000))
                        pr_err("%s: timeout waiting for RESUME\n", __func__);
-               if (handshake(ehci, status_reg, PORT_SUSPEND, 0, 2000))
+               if (ehci_handshake(ehci, status_reg, PORT_SUSPEND, 0, 2000))
                        pr_err("%s: timeout waiting for SUSPEND\n", __func__);
 
                ehci->reset_done[wIndex-1] = 0;
@@ -511,14 +511,14 @@ static int controller_resume(struct device *dev)
        }
 
        /* Poll until CCS is enabled */
-       if (handshake(ehci, &hw->port_status[0], PORT_CONNECT,
+       if (ehci_handshake(ehci, &hw->port_status[0], PORT_CONNECT,
                                                 PORT_CONNECT, 2000)) {
                pr_err("%s: timeout waiting for PORT_CONNECT\n", __func__);
                goto restart;
        }
 
        /* Poll until PE is enabled */
-       if (handshake(ehci, &hw->port_status[0], PORT_PE,
+       if (ehci_handshake(ehci, &hw->port_status[0], PORT_PE,
                                                 PORT_PE, 2000)) {
                pr_err("%s: timeout waiting for USB_PORTSC1_PE\n", __func__);
                goto restart;
@@ -536,7 +536,7 @@ static int controller_resume(struct device *dev)
                writel(val, &hw->port_status[0]);
 
                /* Wait until port suspend completes */
-               if (handshake(ehci, &hw->port_status[0], PORT_SUSPEND,
+               if (ehci_handshake(ehci, &hw->port_status[0], PORT_SUSPEND,
                                                         PORT_SUSPEND, 1000)) {
                        pr_err("%s: timeout waiting for PORT_SUSPEND\n",
                                                                __func__);

diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 7c978b23520d07a871396db9626293fd352944ca..64f9a08e959c73db9359112b1ae6bb889e0b29c4 100644 (file)
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -800,6 +800,8 @@ struct ehci_driver_overrides {
 extern void    ehci_init_driver(struct hc_driver *drv,
                                const struct ehci_driver_overrides *over);
 extern int     ehci_setup(struct usb_hcd *hcd);
+extern int     ehci_handshake(struct ehci_hcd *ehci, void __iomem *ptr,
+                               u32 mask, u32 done, int usec);
 
 #ifdef CONFIG_PM
 extern int     ehci_suspend(struct usb_hcd *hcd, bool do_wakeup);