usb: add host controller __iomem annotations

drivers/usb/core/hcd-pci.c

@@ -65,7 +65,7 @@ int usb_hcd_pci_probe (struct pci_dev *dev, const struct pci_device_id *id)
 {
 	struct hc_driver	*driver;
 	unsigned long		resource, len;
-	void			*base;
+	void __iomem		*base;
 	struct usb_hcd		*hcd;
 	int			retval, region;
 	char			buf [8], *bufp = buf;
@@ -121,7 +121,7 @@ int usb_hcd_pci_probe (struct pci_dev *dev, const struct pci_device_id *id)
 			dev_dbg (&dev->dev, "no i/o regions available\n");
 			return -EBUSY;
 		}
-		base = (void *) resource;
+		base = (void __iomem *) resource;
 	}
 
 	// driver->reset(), later on, will transfer device from

drivers/usb/core/hcd.h

@@ -77,7 +77,7 @@ struct usb_hcd {	/* usb_bus.hcpriv points to this */
 	unsigned		can_wakeup:1;	/* hw supports wakeup? */
 	unsigned		remote_wakeup:1;/* sw should use wakeup? */
 	int			irq;		/* irq allocated */
-	void			*regs;		/* device memory/io */
+	void __iomem		*regs;		/* device memory/io */
 
 #ifdef	CONFIG_PCI
 	int			region;		/* pci region for regs */

drivers/usb/host/ehci-hcd.c

@@ -155,7 +155,7 @@ MODULE_PARM_DESC (log2_irq_thresh, "log2 IRQ latency, 1-64 microframes");
  * 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 (u32 *ptr, u32 mask, u32 done, int usec)
+static int handshake (u32 __iomem *ptr, u32 mask, u32 done, int usec)
 {
 	u32	result;
 
@@ -340,8 +340,8 @@ static int ehci_hc_reset (struct usb_hcd *hcd)
 
 	spin_lock_init (&ehci->lock);
 
-	ehci->caps = (struct ehci_caps *) hcd->regs;
-	ehci->regs = (struct ehci_regs *) (hcd->regs + 
+	ehci->caps = hcd->regs;
+	ehci->regs = (hcd->regs + 
 				HC_LENGTH (readl (&ehci->caps->hc_capbase)));
 	dbg_hcs_params (ehci, "reset");
 	dbg_hcc_params (ehci, "reset");

drivers/usb/host/ehci.h

@@ -70,8 +70,8 @@ struct ehci_hcd {			/* one per controller */
 
 	/* glue to PCI and HCD framework */
 	struct usb_hcd		hcd;
-	struct ehci_caps	*caps;
-	struct ehci_regs	*regs;
+	struct ehci_caps __iomem *caps;
+	struct ehci_regs __iomem *regs;
 	u32			hcs_params;	/* cached register copy */
 
 	/* per-HC memory pools (could be per-bus, but ...) */

drivers/usb/host/ohci-dbg.c

@@ -131,7 +131,7 @@ static char *hcfs2string (int state)
 static void
 ohci_dump_status (struct ohci_hcd *controller, char **next, unsigned *size)
 {
-	struct ohci_regs	*regs = controller->regs;
+	struct ohci_regs __iomem *regs = controller->regs;
 	u32			temp;
 
 	temp = ohci_readl (&regs->revision) & 0xff;
@@ -599,7 +599,7 @@ show_registers (struct class_device *class_dev, char *buf)
 	struct usb_bus		*bus;
 	struct usb_hcd		*hcd;
 	struct ohci_hcd		*ohci;
-	struct ohci_regs	*regs;
+	struct ohci_regs __iomem *regs;
 	unsigned long		flags;
 	unsigned		temp, size;
 	char			*next;

drivers/usb/host/ohci-hcd.c

@@ -594,7 +594,7 @@ static int hc_start (struct ohci_hcd *ohci)
 static irqreturn_t ohci_irq (struct usb_hcd *hcd, struct pt_regs *ptregs)
 {
 	struct ohci_hcd		*ohci = hcd_to_ohci (hcd);
-	struct ohci_regs	*regs = ohci->regs;
+	struct ohci_regs __iomem *regs = ohci->regs;
  	int			ints; 
 
 	/* we can eliminate a (slow) ohci_readl()

drivers/usb/host/ohci-hub.c

@@ -487,7 +487,7 @@ static void start_hnp(struct ohci_hcd *ohci);
 /* called from some task, normally khubd */
 static inline void root_port_reset (struct ohci_hcd *ohci, unsigned port)
 {
-	u32	*portstat = &ohci->regs->roothub.portstatus [port];
+	u32 __iomem *portstat = &ohci->regs->roothub.portstatus [port];
 	u32	temp;
 	u16	now = readl(&ohci->regs->fmnumber);
 	u16	reset_done = now + PORT_RESET_MSEC;

drivers/usb/host/ohci.h

@@ -343,7 +343,7 @@ struct ohci_hcd {
 	/*
 	 * I/O memory used to communicate with the HC (dma-consistent)
 	 */
-	struct ohci_regs	*regs;
+	struct ohci_regs __iomem *regs;
 
 	/*
 	 * main memory used to communicate with the HC (dma-consistent).
@@ -450,7 +450,7 @@ static inline unsigned int ohci_readl (void* regs)
 #else
 	/* Standard version of ohci_readl uses standard, platform
 	 * specific implementation. */
-static inline unsigned int ohci_readl (void* regs)
+static inline unsigned int ohci_readl (void __iomem * regs)
 {
 	return readl (regs);
 }