USB: EHCI: define extension registers like normal ones

This patch (as1562) cleans up the definitions of the EHCI extended
registers to be consistent with the definitions of the standard
registers.  This makes the code look a lot nicer, with no functional
change.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 13 insertions, 28 deletions

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 800be38c78b4..c49fc1e7895d 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -203,11 +203,9 @@ static int handshake (struct ehci_hcd *ehci, void __iomem *ptr,
 /* check TDI/ARC silicon is in host mode */
 static int tdi_in_host_mode (struct ehci_hcd *ehci)
 {
-        u32 __iomem     *reg_ptr;
         u32             tmp;
 
-        reg_ptr = (u32 __iomem *)(((u8 __iomem *)ehci->regs) + USBMODE);
-        tmp = ehci_readl(ehci, reg_ptr);
+        tmp = ehci_readl(ehci, &ehci->regs->usbmode);
         return (tmp & 3) == USBMODE_CM_HC;
 }
 
@@ -303,11 +301,9 @@ static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
 /* put TDI/ARC silicon into EHCI mode */
 static void tdi_reset (struct ehci_hcd *ehci)
 {
-        u32 __iomem     *reg_ptr;
         u32             tmp;
 
-        reg_ptr = (u32 __iomem *)(((u8 __iomem *)ehci->regs) + USBMODE);
-        tmp = ehci_readl(ehci, reg_ptr);
+        tmp = ehci_readl(ehci, &ehci->regs->usbmode);
         tmp |= USBMODE_CM_HC;
         /* The default byte access to MMR space is LE after
          * controller reset. Set the required endian mode
@@ -315,7 +311,7 @@ static void tdi_reset (struct ehci_hcd *ehci)
          */
         if (ehci_big_endian_mmio(ehci))
                 tmp |= USBMODE_BE;
-        ehci_writel(ehci, tmp, reg_ptr);
+        ehci_writel(ehci, tmp, &ehci->regs->usbmode);
 }
 
 /* reset a non-running (STS_HALT == 1) controller */
@@ -339,9 +335,8 @@ static int ehci_reset (struct ehci_hcd *ehci)
 
         if (ehci->has_hostpc) {
                 ehci_writel(ehci, USBMODE_EX_HC | USBMODE_EX_VBPS,
-                        (u32 __iomem *)(((u8 *)ehci->regs) + USBMODE_EX));
-                ehci_writel(ehci, TXFIFO_DEFAULT,
-                        (u32 __iomem *)(((u8 *)ehci->regs) + TXFILLTUNING));
+                                &ehci->regs->usbmode_ex);
+                ehci_writel(ehci, TXFIFO_DEFAULT, &ehci->regs->txfill_tuning);
         }
         if (retval)
                 return retval;
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index dd5eef6af6df..db05e358677a 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -149,10 +149,8 @@ static __maybe_unused void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
         if (ehci->has_hostpc) {
                 port = HCS_N_PORTS(ehci->hcs_params);
                 while (port--) {
-                        u32 __iomem     *hostpc_reg;
+                        u32 __iomem     *hostpc_reg = &ehci->regs->hostpc[port];
 
-                        hostpc_reg = (u32 __iomem *)((u8 *) ehci->regs
-                                        + HOSTPC0 + 4 * port);
                         temp = ehci_readl(ehci, hostpc_reg);
                         ehci_writel(ehci, temp & ~HOSTPC_PHCD, hostpc_reg);
                 }
@@ -185,10 +183,8 @@ static __maybe_unused void ehci_adjust_port_wakeup_flags(struct ehci_hcd *ehci,
         if (ehci->has_hostpc) {
                 port = HCS_N_PORTS(ehci->hcs_params);
                 while (port--) {
-                        u32 __iomem     *hostpc_reg;
+                        u32 __iomem     *hostpc_reg = &ehci->regs->hostpc[port];
 
-                        hostpc_reg = (u32 __iomem *)((u8 *) ehci->regs
-                                        + HOSTPC0 + 4 * port);
                         temp = ehci_readl(ehci, hostpc_reg);
                         ehci_writel(ehci, temp | HOSTPC_PHCD, hostpc_reg);
                 }
@@ -285,11 +281,9 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
 
                 port = HCS_N_PORTS(ehci->hcs_params);
                 while (port--) {
-                        u32 __iomem     *hostpc_reg;
+                        u32 __iomem     *hostpc_reg = &ehci->regs->hostpc[port];
                         u32             t3;
 
-                        hostpc_reg = (u32 __iomem *)((u8 *) ehci->regs
-                                        + HOSTPC0 + 4 * port);
                         t3 = ehci_readl(ehci, hostpc_reg);
                         ehci_writel(ehci, t3 | HOSTPC_PHCD, hostpc_reg);
                         t3 = ehci_readl(ehci, hostpc_reg);
@@ -388,10 +382,9 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
                 i = HCS_N_PORTS(ehci->hcs_params);
                 while (i--) {
                         if (test_bit(i, &ehci->bus_suspended)) {
-                                u32 __iomem     *hostpc_reg;
+                                u32 __iomem     *hostpc_reg =
+                                                        &ehci->regs->hostpc[i];
 
-                                hostpc_reg = (u32 __iomem *)((u8 *) ehci->regs
-                                                + HOSTPC0 + 4 * i);
                                 temp = ehci_readl(ehci, hostpc_reg);
                                 ehci_writel(ehci, temp & ~HOSTPC_PHCD,
                                                 hostpc_reg);
@@ -667,7 +660,7 @@ static int ehci_hub_control (
         int             ports = HCS_N_PORTS (ehci->hcs_params);
         u32 __iomem     *status_reg = &ehci->regs->port_status[
                                 (wIndex & 0xff) - 1];
-        u32 __iomem     *hostpc_reg = NULL;
+        u32 __iomem     *hostpc_reg = &ehci->regs->hostpc[(wIndex & 0xff) - 1];
         u32             temp, temp1, status;
         unsigned long   flags;
         int             retval = 0;
@@ -680,9 +673,6 @@ static int ehci_hub_control (
          * power, "this is the one", etc.  EHCI spec supports this.
          */
 
-        if (ehci->has_hostpc)
-                hostpc_reg = (u32 __iomem *)((u8 *)ehci->regs
-                                + HOSTPC0 + 4 * ((wIndex & 0xff) - 1));
         spin_lock_irqsave (&ehci->lock, flags);
         switch (typeReq) {
         case ClearHubFeature:
@@ -734,7 +724,7 @@ static int ehci_hub_control (
                                 goto error;
 
                         /* clear phy low-power mode before resume */
-                        if (hostpc_reg) {
+                        if (ehci->has_hostpc) {
                                 temp1 = ehci_readl(ehci, hostpc_reg);
                                 ehci_writel(ehci, temp1 & ~HOSTPC_PHCD,
                                                 hostpc_reg);
@@ -984,7 +974,7 @@ static int ehci_hub_control (
                         temp &= ~PORT_WKCONN_E;
                         temp |= PORT_WKDISC_E | PORT_WKOC_E;
                         ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
-                        if (hostpc_reg) {
+                        if (ehci->has_hostpc) {
                                 spin_unlock_irqrestore(&ehci->lock, flags);
                                 msleep(5);/* 5ms for HCD enter low pwr mode */
                                 spin_lock_irqsave(&ehci->lock, flags);