xhci: replace xhci_readl() with readl()

Function xhci_readl() is used to read 32bit xHC registers residing in MMIO
address space. It takes as first argument a pointer to the xhci_hcd although
it does not use it. xhci_readl() internally simply calls readl(). This creates
an illusion that xhci_readl() is an xhci specific function that has to be
called in a context where a pointer to xhci_hcd is available.

Remove the unnecessary xhci_readl() wrapper function and replace its calls to
with calls to readl() to make the code more straightforward.

Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 99e7251c2b65..3682a3b7e057 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1986,7 +1986,7 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports,
         }
 
         /* Port offset and count in the third dword, see section 7.2 */
-        temp = xhci_readl(xhci, addr + 2);
+        temp = readl(addr + 2);
         port_offset = XHCI_EXT_PORT_OFF(temp);
         port_count = XHCI_EXT_PORT_COUNT(temp);
         xhci_dbg_trace(xhci, trace_xhci_dbg_init,
@@ -2069,7 +2069,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)
         int cap_count = 0;
 
         addr = &xhci->cap_regs->hcc_params;
-        offset = XHCI_HCC_EXT_CAPS(xhci_readl(xhci, addr));
+        offset = XHCI_HCC_EXT_CAPS(readl(addr));
         if (offset == 0) {
                 xhci_err(xhci, "No Extended Capability registers, "
                                 "unable to set up roothub.\n");
@@ -2106,7 +2106,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)
         /* count extended protocol capability entries for later caching */
         do {
                 u32 cap_id;
-                cap_id = xhci_readl(xhci, tmp_addr);
+                cap_id = readl(tmp_addr);
                 if (XHCI_EXT_CAPS_ID(cap_id) == XHCI_EXT_CAPS_PROTOCOL)
                         cap_count++;
                 tmp_offset = XHCI_EXT_CAPS_NEXT(cap_id);
@@ -2120,7 +2120,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)
         while (1) {
                 u32 cap_id;
 
-                cap_id = xhci_readl(xhci, addr);
+                cap_id = readl(addr);
                 if (XHCI_EXT_CAPS_ID(cap_id) == XHCI_EXT_CAPS_PROTOCOL)
                         xhci_add_in_port(xhci, num_ports, addr,
                                         (u8) XHCI_EXT_PORT_MAJOR(cap_id),
@@ -2224,7 +2224,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
 
         INIT_LIST_HEAD(&xhci->cancel_cmd_list);
 
-        page_size = xhci_readl(xhci, &xhci->op_regs->page_size);
+        page_size = readl(&xhci->op_regs->page_size);
         xhci_dbg_trace(xhci, trace_xhci_dbg_init,
                         "Supported page size register = 0x%x", page_size);
         for (i = 0; i < 16; i++) {
@@ -2247,10 +2247,10 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
          * Program the Number of Device Slots Enabled field in the CONFIG
          * register with the max value of slots the HC can handle.
          */
-        val = HCS_MAX_SLOTS(xhci_readl(xhci, &xhci->cap_regs->hcs_params1));
+        val = HCS_MAX_SLOTS(readl(&xhci->cap_regs->hcs_params1));
         xhci_dbg_trace(xhci, trace_xhci_dbg_init,
                         "// xHC can handle at most %d device slots.", val);
-        val2 = xhci_readl(xhci, &xhci->op_regs->config_reg);
+        val2 = readl(&xhci->op_regs->config_reg);
         val |= (val2 & ~HCS_SLOTS_MASK);
         xhci_dbg_trace(xhci, trace_xhci_dbg_init,
                         "// Setting Max device slots reg = 0x%x.", val);
@@ -2331,7 +2331,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
          */
         xhci->cmd_ring_reserved_trbs++;
 
-        val = xhci_readl(xhci, &xhci->cap_regs->db_off);
+        val = readl(&xhci->cap_regs->db_off);
         val &= DBOFF_MASK;
         xhci_dbg_trace(xhci, trace_xhci_dbg_init,
                         "// Doorbell array is located at offset 0x%x"
@@ -2382,7 +2382,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
         }
 
         /* set ERST count with the number of entries in the segment table */
-        val = xhci_readl(xhci, &xhci->ir_set->erst_size);
+        val = readl(&xhci->ir_set->erst_size);
         val &= ERST_SIZE_MASK;
         val |= ERST_NUM_SEGS;
         xhci_dbg_trace(xhci, trace_xhci_dbg_init,
@@ -2431,7 +2431,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
          * is necessary for allowing USB 3.0 devices to do remote wakeup from
          * U3 (device suspend).
          */
-        temp = xhci_readl(xhci, &xhci->op_regs->dev_notification);
+        temp = readl(&xhci->op_regs->dev_notification);
         temp &= ~DEV_NOTE_MASK;
         temp |= DEV_NOTE_FWAKE;
         xhci_writel(xhci, temp, &xhci->op_regs->dev_notification);