Commit ad28656e authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] aac7xxx iomem annotations

aic7xxx annotations - trivial part
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c8d53504
...@@ -145,7 +145,7 @@ typedef enum { ...@@ -145,7 +145,7 @@ typedef enum {
typedef union { typedef union {
u_long ioport; u_long ioport;
volatile uint8_t *maddr; volatile uint8_t __iomem *maddr;
} bus_space_handle_t; } bus_space_handle_t;
typedef struct bus_dma_segment typedef struct bus_dma_segment
......
...@@ -49,7 +49,7 @@ static int ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, ...@@ -49,7 +49,7 @@ static int ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd,
u_long *base, u_long *base2); u_long *base, u_long *base2);
static int ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd, static int ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
u_long *bus_addr, u_long *bus_addr,
uint8_t **maddr); uint8_t __iomem **maddr);
static void ahd_linux_pci_dev_remove(struct pci_dev *pdev); static void ahd_linux_pci_dev_remove(struct pci_dev *pdev);
/* Define the macro locally since it's different for different class of chips. /* Define the macro locally since it's different for different class of chips.
...@@ -245,7 +245,7 @@ ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, u_long *base, ...@@ -245,7 +245,7 @@ ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, u_long *base,
static int static int
ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd, ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
u_long *bus_addr, u_long *bus_addr,
uint8_t **maddr) uint8_t __iomem **maddr)
{ {
u_long start; u_long start;
u_long base_page; u_long base_page;
...@@ -284,7 +284,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd) ...@@ -284,7 +284,7 @@ ahd_pci_map_registers(struct ahd_softc *ahd)
{ {
uint32_t command; uint32_t command;
u_long base; u_long base;
uint8_t *maddr; uint8_t __iomem *maddr;
int error; int error;
/* /*
......
...@@ -157,7 +157,7 @@ typedef enum { ...@@ -157,7 +157,7 @@ typedef enum {
typedef union { typedef union {
u_long ioport; u_long ioport;
volatile uint8_t *maddr; volatile uint8_t __iomem *maddr;
} bus_space_handle_t; } bus_space_handle_t;
typedef struct bus_dma_segment typedef struct bus_dma_segment
......
...@@ -54,7 +54,7 @@ static int ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc, ...@@ -54,7 +54,7 @@ static int ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc,
u_long *base); u_long *base);
static int ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc, static int ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
u_long *bus_addr, u_long *bus_addr,
uint8_t **maddr); uint8_t __iomem **maddr);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
static void ahc_linux_pci_dev_remove(struct pci_dev *pdev); static void ahc_linux_pci_dev_remove(struct pci_dev *pdev);
...@@ -326,7 +326,7 @@ ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc, u_long *base) ...@@ -326,7 +326,7 @@ ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc, u_long *base)
static int static int
ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc, ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
u_long *bus_addr, u_long *bus_addr,
uint8_t **maddr) uint8_t __iomem **maddr)
{ {
u_long start; u_long start;
u_long base_page; u_long base_page;
...@@ -370,7 +370,7 @@ ahc_pci_map_registers(struct ahc_softc *ahc) ...@@ -370,7 +370,7 @@ ahc_pci_map_registers(struct ahc_softc *ahc)
{ {
uint32_t command; uint32_t command;
u_long base; u_long base;
uint8_t *maddr; uint8_t __iomem *maddr;
int error; int error;
/* /*
......
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