ChangeSet 1.1867.3.18, 2004/09/15 13:17:50-07:00, [EMAIL PROTECTED]
USB: fix up __iomem warnings in the ohci driver.
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
drivers/usb/host/ohci-dbg.c | 4 ++--
drivers/usb/host/ohci-hcd.c | 2 +-
drivers/usb/host/ohci-hub.c | 2 +-
drivers/usb/host/ohci.h | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff -Nru a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
--- a/drivers/usb/host/ohci-dbg.c 2004-10-19 08:12:56 -07:00
+++ b/drivers/usb/host/ohci-dbg.c 2004-10-19 08:12:56 -07:00
@@ -131,7 +131,7 @@
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 (®s->revision) & 0xff;
@@ -599,7 +599,7 @@
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;
diff -Nru a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
--- a/drivers/usb/host/ohci-hcd.c 2004-10-19 08:12:56 -07:00
+++ b/drivers/usb/host/ohci-hcd.c 2004-10-19 08:12:56 -07:00
@@ -679,7 +679,7 @@
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()
diff -Nru a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
--- a/drivers/usb/host/ohci-hub.c 2004-10-19 08:12:56 -07:00
+++ b/drivers/usb/host/ohci-hub.c 2004-10-19 08:12:56 -07:00
@@ -468,7 +468,7 @@
/* 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;
diff -Nru a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
--- a/drivers/usb/host/ohci.h 2004-10-19 08:12:56 -07:00
+++ b/drivers/usb/host/ohci.h 2004-10-19 08:12:56 -07:00
@@ -342,7 +342,7 @@
/*
* 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 @@
#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);
}
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
