Commit 2d31f964 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: fix up __iomem warnings in the ohci driver.

Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 3e4e0e44
......@@ -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;
......
......@@ -679,7 +679,7 @@ static int ohci_run (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()
......
......@@ -468,7 +468,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;
......
......@@ -342,7 +342,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).
......@@ -452,7 +452,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);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment