Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (70 commits)
  USB: remove duplicate device id from zc0301
  USB: remove duplicate device id from usb_storage
  USB: remove duplicate device id from keyspan
  USB: remove duplicate device id from ftdi_sio
  USB: remove duplicate device id from visor
  USB: a bit more coding style cleanup
  usbcore: trivial whitespace fixes
  usb-storage: use first bulk endpoints, not last
  EHCI: fix interrupt-driven remote wakeup
  USB: switch ehci-hcd to new polling scheme
  USB: autosuspend for usb printer driver
  USB Input: Added kernel module to support all GTCO CalComp USB InterWrite School products
  USB: Sierra Wireless auto set D0
  USB: usb ethernet gadget recognizes HUSB2DEV
  USB: list atmel husb2_udc gadget controller
  USB: gadgetfs AIO tweaks
  USB: gadgetfs behaves better on userspace init bug
  USB: gadgetfs race fix
  USB: gadgetfs simplifications
  USB: gadgetfs cleanups
  ...

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 62e46dc60e86..e7fbbd00e7cd 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -789,13 +789,14 @@ static void qh_link_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
         head = ehci->async;
         timer_action_done (ehci, TIMER_ASYNC_OFF);
         if (!head->qh_next.qh) {
-                u32     cmd = readl (&ehci->regs->command);
+                u32     cmd = ehci_readl(ehci, &ehci->regs->command);
 
                 if (!(cmd & CMD_ASE)) {
                         /* in case a clear of CMD_ASE didn't take yet */
-                        (void) handshake (&ehci->regs->status, STS_ASS, 0, 150);
+                        (void)handshake(ehci, &ehci->regs->status,
+                                        STS_ASS, 0, 150);
                         cmd |= CMD_ASE | CMD_RUN;
-                        writel (cmd, &ehci->regs->command);
+                        ehci_writel(ehci, cmd, &ehci->regs->command);
                         ehci_to_hcd(ehci)->state = HC_STATE_RUNNING;
                         /* posted write need not be known to HC yet ... */
                 }
@@ -1007,7 +1008,7 @@ static void end_unlink_async (struct ehci_hcd *ehci)
 
 static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
 {
-        int             cmd = readl (&ehci->regs->command);
+        int             cmd = ehci_readl(ehci, &ehci->regs->command);
         struct ehci_qh  *prev;
 
 #ifdef DEBUG
@@ -1025,7 +1026,8 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
                 if (ehci_to_hcd(ehci)->state != HC_STATE_HALT
                                 && !ehci->reclaim) {
                         /* ... and CMD_IAAD clear */
-                        writel (cmd & ~CMD_ASE, &ehci->regs->command);
+                        ehci_writel(ehci, cmd & ~CMD_ASE,
+                                    &ehci->regs->command);
                         wmb ();
                         // handshake later, if we need to
                         timer_action_done (ehci, TIMER_ASYNC_OFF);
@@ -1054,8 +1056,8 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
 
         ehci->reclaim_ready = 0;
         cmd |= CMD_IAAD;
-        writel (cmd, &ehci->regs->command);
-        (void) readl (&ehci->regs->command);
+        ehci_writel(ehci, cmd, &ehci->regs->command);
+        (void)ehci_readl(ehci, &ehci->regs->command);
         timer_action (ehci, TIMER_IAA_WATCHDOG);
 }