1 files changed, 51 insertions, 55 deletions

diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 805f2348eeba..9992fbfec85f 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -94,7 +94,7 @@ static void xhci_usb2_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
          */
         memset(port_removable, 0, sizeof(port_removable));
         for (i = 0; i < ports; i++) {
-                portsc = xhci_readl(xhci, xhci->usb2_ports[i]);
+                portsc = readl(xhci->usb2_ports[i]);
                 /* If a device is removable, PORTSC reports a 0, same as in the
                  * hub descriptor DeviceRemovable bits.
                  */
@@ -148,7 +148,7 @@ static void xhci_usb3_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
         port_removable = 0;
         /* bit 0 is reserved, bit 1 is for port 1, etc. */
         for (i = 0; i < ports; i++) {
-                portsc = xhci_readl(xhci, xhci->usb3_ports[i]);
+                portsc = readl(xhci->usb3_ports[i]);
                 if (portsc & PORT_DEV_REMOVE)
                         port_removable |= 1 << (i + 1);
         }
@@ -342,8 +342,8 @@ static void xhci_disable_port(struct usb_hcd *hcd, struct xhci_hcd *xhci,
         }
 
         /* Write 1 to disable the port */
-        xhci_writel(xhci, port_status | PORT_PE, addr);
-        port_status = xhci_readl(xhci, addr);
+        writel(port_status | PORT_PE, addr);
+        port_status = readl(addr);
         xhci_dbg(xhci, "disable port, actual port %d status  = 0x%x\n",
                         wIndex, port_status);
 }
@@ -388,8 +388,8 @@ static void xhci_clear_port_change_bit(struct xhci_hcd *xhci, u16 wValue,
                 return;
         }
         /* Change bits are all write 1 to clear */
-        xhci_writel(xhci, port_status | status, addr);
-        port_status = xhci_readl(xhci, addr);
+        writel(port_status | status, addr);
+        port_status = readl(addr);
         xhci_dbg(xhci, "clear port %s change, actual port %d status  = 0x%x\n",
                         port_change_bit, wIndex, port_status);
 }
@@ -415,11 +415,11 @@ void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array,
 {
         u32 temp;
 
-        temp = xhci_readl(xhci, port_array[port_id]);
+        temp = readl(port_array[port_id]);
         temp = xhci_port_state_to_neutral(temp);
         temp &= ~PORT_PLS_MASK;
         temp |= PORT_LINK_STROBE | link_state;
-        xhci_writel(xhci, temp, port_array[port_id]);
+        writel(temp, port_array[port_id]);
 }
 
 static void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
@@ -427,7 +427,7 @@ static void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
 {
         u32 temp;
 
-        temp = xhci_readl(xhci, port_array[port_id]);
+        temp = readl(port_array[port_id]);
         temp = xhci_port_state_to_neutral(temp);
 
         if (wake_mask & USB_PORT_FEAT_REMOTE_WAKE_CONNECT)
@@ -445,7 +445,7 @@ static void xhci_set_remote_wake_mask(struct xhci_hcd *xhci,
         else
                 temp &= ~PORT_WKOC_E;
 
-        xhci_writel(xhci, temp, port_array[port_id]);
+        writel(temp, port_array[port_id]);
 }
 
 /* Test and clear port RWC bit */
@@ -454,11 +454,11 @@ void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array,
 {
         u32 temp;
 
-        temp = xhci_readl(xhci, port_array[port_id]);
+        temp = readl(port_array[port_id]);
         if (temp & port_bit) {
                 temp = xhci_port_state_to_neutral(temp);
                 temp |= port_bit;
-                xhci_writel(xhci, temp, port_array[port_id]);
+                writel(temp, port_array[port_id]);
         }
 }
 
@@ -623,8 +623,7 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
                                 }
                                 xhci_ring_device(xhci, slot_id);
                         } else {
-                                int port_status = xhci_readl(xhci,
-                                                port_array[wIndex]);
+                                int port_status = readl(port_array[wIndex]);
                                 xhci_warn(xhci, "Port resume took longer than %i msec, port status = 0x%x\n",
                                                 XHCI_MAX_REXIT_TIMEOUT,
                                                 port_status);
@@ -733,12 +732,12 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 /* Set the U1 and U2 exit latencies. */
                 memcpy(buf, &usb_bos_descriptor,
                                 USB_DT_BOS_SIZE + USB_DT_USB_SS_CAP_SIZE);
-                temp = xhci_readl(xhci, &xhci->cap_regs->hcs_params3);
+                temp = readl(&xhci->cap_regs->hcs_params3);
                 buf[12] = HCS_U1_LATENCY(temp);
                 put_unaligned_le16(HCS_U2_LATENCY(temp), &buf[13]);
 
                 /* Indicate whether the host has LTM support. */
-                temp = xhci_readl(xhci, &xhci->cap_regs->hcc_params);
+                temp = readl(&xhci->cap_regs->hcc_params);
                 if (HCC_LTC(temp))
                         buf[8] |= USB_LTM_SUPPORT;
 
@@ -748,7 +747,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 if (!wIndex || wIndex > max_ports)
                         goto error;
                 wIndex--;
-                temp = xhci_readl(xhci, port_array[wIndex]);
+                temp = readl(port_array[wIndex]);
                 if (temp == 0xffffffff) {
                         retval = -ENODEV;
                         break;
@@ -775,7 +774,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 if (!wIndex || wIndex > max_ports)
                         goto error;
                 wIndex--;
-                temp = xhci_readl(xhci, port_array[wIndex]);
+                temp = readl(port_array[wIndex]);
                 if (temp == 0xffffffff) {
                         retval = -ENODEV;
                         break;
@@ -784,7 +783,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 /* FIXME: What new port features do we need to support? */
                 switch (wValue) {
                 case USB_PORT_FEAT_SUSPEND:
-                        temp = xhci_readl(xhci, port_array[wIndex]);
+                        temp = readl(port_array[wIndex]);
                         if ((temp & PORT_PLS_MASK) != XDEV_U0) {
                                 /* Resume the port to U0 first */
                                 xhci_set_link_state(xhci, port_array, wIndex,
@@ -797,7 +796,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                          * a port unless the port reports that it is in the
                          * enabled (PED = ‘1’,PLS < ‘3’) state.
                          */
-                        temp = xhci_readl(xhci, port_array[wIndex]);
+                        temp = readl(port_array[wIndex]);
                         if ((temp & PORT_PE) == 0 || (temp & PORT_RESET)
                                 || (temp & PORT_PLS_MASK) >= XDEV_U3) {
                                 xhci_warn(xhci, "USB core suspending device "
@@ -822,11 +821,11 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         msleep(10); /* wait device to enter */
                         spin_lock_irqsave(&xhci->lock, flags);
 
-                        temp = xhci_readl(xhci, port_array[wIndex]);
+                        temp = readl(port_array[wIndex]);
                         bus_state->suspended_ports |= 1 << wIndex;
                         break;
                 case USB_PORT_FEAT_LINK_STATE:
-                        temp = xhci_readl(xhci, port_array[wIndex]);
+                        temp = readl(port_array[wIndex]);
 
                         /* Disable port */
                         if (link_state == USB_SS_PORT_LS_SS_DISABLED) {
@@ -839,9 +838,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                 temp |= PORT_CSC | PORT_PEC | PORT_WRC |
                                         PORT_OCC | PORT_RC | PORT_PLC |
                                         PORT_CEC;
-                                xhci_writel(xhci, temp | PORT_PE,
-                                        port_array[wIndex]);
-                                temp = xhci_readl(xhci, port_array[wIndex]);
+                                writel(temp | PORT_PE, port_array[wIndex]);
+                                temp = readl(port_array[wIndex]);
                                 break;
                         }
 
@@ -850,7 +848,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                 xhci_dbg(xhci, "Enable port %d\n", wIndex);
                                 xhci_set_link_state(xhci, port_array, wIndex,
                                                 link_state);
-                                temp = xhci_readl(xhci, port_array[wIndex]);
+                                temp = readl(port_array[wIndex]);
                                 break;
                         }
 
@@ -884,7 +882,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         msleep(20); /* wait device to enter */
                         spin_lock_irqsave(&xhci->lock, flags);
 
-                        temp = xhci_readl(xhci, port_array[wIndex]);
+                        temp = readl(port_array[wIndex]);
                         if (link_state == USB_SS_PORT_LS_U3)
                                 bus_state->suspended_ports |= 1 << wIndex;
                         break;
@@ -895,10 +893,9 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                          * However, khubd will ignore the roothub events until
                          * the roothub is registered.
                          */
-                        xhci_writel(xhci, temp | PORT_POWER,
-                                        port_array[wIndex]);
+                        writel(temp | PORT_POWER, port_array[wIndex]);
 
-                        temp = xhci_readl(xhci, port_array[wIndex]);
+                        temp = readl(port_array[wIndex]);
                         xhci_dbg(xhci, "set port power, actual port %d status  = 0x%x\n", wIndex, temp);
 
                         spin_unlock_irqrestore(&xhci->lock, flags);
@@ -911,52 +908,52 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                         break;
                 case USB_PORT_FEAT_RESET:
                         temp = (temp | PORT_RESET);
-                        xhci_writel(xhci, temp, port_array[wIndex]);
+                        writel(temp, port_array[wIndex]);
 
-                        temp = xhci_readl(xhci, port_array[wIndex]);
+                        temp = readl(port_array[wIndex]);
                         xhci_dbg(xhci, "set port reset, actual port %d status  = 0x%x\n", wIndex, temp);
                         break;
                 case USB_PORT_FEAT_REMOTE_WAKE_MASK:
                         xhci_set_remote_wake_mask(xhci, port_array,
                                         wIndex, wake_mask);
-                        temp = xhci_readl(xhci, port_array[wIndex]);
+                        temp = readl(port_array[wIndex]);
                         xhci_dbg(xhci, "set port remote wake mask, "
                                         "actual port %d status  = 0x%x\n",
                                         wIndex, temp);
                         break;
                 case USB_PORT_FEAT_BH_PORT_RESET:
                         temp |= PORT_WR;
-                        xhci_writel(xhci, temp, port_array[wIndex]);
+                        writel(temp, port_array[wIndex]);
 
-                        temp = xhci_readl(xhci, port_array[wIndex]);
+                        temp = readl(port_array[wIndex]);
                         break;
                 case USB_PORT_FEAT_U1_TIMEOUT:
                         if (hcd->speed != HCD_USB3)
                                 goto error;
-                        temp = xhci_readl(xhci, port_array[wIndex] + PORTPMSC);
+                        temp = readl(port_array[wIndex] + PORTPMSC);
                         temp &= ~PORT_U1_TIMEOUT_MASK;
                         temp |= PORT_U1_TIMEOUT(timeout);
-                        xhci_writel(xhci, temp, port_array[wIndex] + PORTPMSC);
+                        writel(temp, port_array[wIndex] + PORTPMSC);
                         break;
                 case USB_PORT_FEAT_U2_TIMEOUT:
                         if (hcd->speed != HCD_USB3)
                                 goto error;
-                        temp = xhci_readl(xhci, port_array[wIndex] + PORTPMSC);
+                        temp = readl(port_array[wIndex] + PORTPMSC);
                         temp &= ~PORT_U2_TIMEOUT_MASK;
                         temp |= PORT_U2_TIMEOUT(timeout);
-                        xhci_writel(xhci, temp, port_array[wIndex] + PORTPMSC);
+                        writel(temp, port_array[wIndex] + PORTPMSC);
                         break;
                 default:
                         goto error;
                 }
                 /* unblock any posted writes */
-                temp = xhci_readl(xhci, port_array[wIndex]);
+                temp = readl(port_array[wIndex]);
                 break;
         case ClearPortFeature:
                 if (!wIndex || wIndex > max_ports)
                         goto error;
                 wIndex--;
-                temp = xhci_readl(xhci, port_array[wIndex]);
+                temp = readl(port_array[wIndex]);
                 if (temp == 0xffffffff) {
                         retval = -ENODEV;
                         break;
@@ -965,7 +962,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                 temp = xhci_port_state_to_neutral(temp);
                 switch (wValue) {
                 case USB_PORT_FEAT_SUSPEND:
-                        temp = xhci_readl(xhci, port_array[wIndex]);
+                        temp = readl(port_array[wIndex]);
                         xhci_dbg(xhci, "clear USB_PORT_FEAT_SUSPEND\n");
                         xhci_dbg(xhci, "PORTSC %04x\n", temp);
                         if (temp & PORT_RESET)
@@ -1008,8 +1005,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                                         port_array[wIndex], temp);
                         break;
                 case USB_PORT_FEAT_POWER:
-                        xhci_writel(xhci, temp & ~PORT_POWER,
-                                port_array[wIndex]);
+                        writel(temp & ~PORT_POWER, port_array[wIndex]);
 
                         spin_unlock_irqrestore(&xhci->lock, flags);
                         temp = usb_acpi_power_manageable(hcd->self.root_hub,
@@ -1070,7 +1066,7 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
         spin_lock_irqsave(&xhci->lock, flags);
         /* For each port, did anything change?  If so, set that bit in buf. */
         for (i = 0; i < max_ports; i++) {
-                temp = xhci_readl(xhci, port_array[i]);
+                temp = readl(port_array[i]);
                 if (temp == 0xffffffff) {
                         retval = -ENODEV;
                         break;
@@ -1124,7 +1120,7 @@ int xhci_bus_suspend(struct usb_hcd *hcd)
                 u32 t1, t2;
                 int slot_id;
 
-                t1 = xhci_readl(xhci, port_array[port_index]);
+                t1 = readl(port_array[port_index]);
                 t2 = xhci_port_state_to_neutral(t1);
 
                 if ((t1 & PORT_PE) && !(t1 & PORT_PLS_MASK)) {
@@ -1157,7 +1153,7 @@ int xhci_bus_suspend(struct usb_hcd *hcd)
 
                 t1 = xhci_port_state_to_neutral(t1);
                 if (t1 != t2)
-                        xhci_writel(xhci, t2, port_array[port_index]);
+                        writel(t2, port_array[port_index]);
         }
         hcd->state = HC_STATE_SUSPENDED;
         bus_state->next_statechange = jiffies + msecs_to_jiffies(10);
@@ -1187,9 +1183,9 @@ int xhci_bus_resume(struct usb_hcd *hcd)
         }
 
         /* delay the irqs */
-        temp = xhci_readl(xhci, &xhci->op_regs->command);
+        temp = readl(&xhci->op_regs->command);
         temp &= ~CMD_EIE;
-        xhci_writel(xhci, temp, &xhci->op_regs->command);
+        writel(temp, &xhci->op_regs->command);
 
         port_index = max_ports;
         while (port_index--) {
@@ -1198,7 +1194,7 @@ int xhci_bus_resume(struct usb_hcd *hcd)
                 u32 temp;
                 int slot_id;
 
-                temp = xhci_readl(xhci, port_array[port_index]);
+                temp = readl(port_array[port_index]);
                 if (DEV_SUPERSPEED(temp))
                         temp &= ~(PORT_RWC_BITS | PORT_CEC | PORT_WAKE_BITS);
                 else
@@ -1235,17 +1231,17 @@ int xhci_bus_resume(struct usb_hcd *hcd)
                         if (slot_id)
                                 xhci_ring_device(xhci, slot_id);
                 } else
-                        xhci_writel(xhci, temp, port_array[port_index]);
+                        writel(temp, port_array[port_index]);
         }
 
-        (void) xhci_readl(xhci, &xhci->op_regs->command);
+        (void) readl(&xhci->op_regs->command);
 
         bus_state->next_statechange = jiffies + msecs_to_jiffies(5);
         /* re-enable irqs */
-        temp = xhci_readl(xhci, &xhci->op_regs->command);
+        temp = readl(&xhci->op_regs->command);
         temp |= CMD_EIE;
-        xhci_writel(xhci, temp, &xhci->op_regs->command);
-        temp = xhci_readl(xhci, &xhci->op_regs->command);
+        writel(temp, &xhci->op_regs->command);
+        temp = readl(&xhci->op_regs->command);
 
         spin_unlock_irqrestore(&xhci->lock, flags);
         return 0;