Commit 5cdcb6b7 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] sound/oss iomem annotations

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6b9fba51
......@@ -104,7 +104,7 @@ struct btaudio {
struct pci_dev *pci;
unsigned int irq;
unsigned long mem;
unsigned long *mmio;
unsigned long __iomem *mmio;
/* locking */
int users;
......
......@@ -221,7 +221,8 @@ struct cs4281_state {
// hardware resources
unsigned int pBA0phys, pBA1phys;
char *pBA0, *pBA1;
char __iomem *pBA0;
char __iomem *pBA1;
unsigned int irq;
// mixer registers
......
......@@ -346,17 +346,17 @@ struct cs_card {
u32 irq;
/* mappings */
void *ba0;
void __iomem *ba0;
union
{
struct
{
u8 *data0;
u8 *data1;
u8 *pmem;
u8 *reg;
u8 __iomem *data0;
u8 __iomem *data1;
u8 __iomem *pmem;
u8 __iomem *reg;
} name;
u8 *idx[4];
u8 __iomem *idx[4];
} ba1;
/* Function support */
......@@ -4309,7 +4309,7 @@ static int __init cs_ac97_init(struct cs_card *card)
static void cs461x_download_image(struct cs_card *card)
{
unsigned i, j, temp1, temp2, offset, count;
unsigned char *pBA1 = ioremap(card->ba1_addr, 0x40000);
unsigned char __iomem *pBA1 = ioremap(card->ba1_addr, 0x40000);
for( i=0; i < CLEAR__COUNT; i++)
{
offset = ClrStat[i].BA1__DestByteOffset;
......
......@@ -429,8 +429,8 @@ struct i810_card {
unsigned long ac97base_mmio_phys;
unsigned long iobase_mmio_phys;
u_int8_t *ac97base_mmio;
u_int8_t *iobase_mmio;
u_int8_t __iomem *ac97base_mmio;
u_int8_t __iomem *iobase_mmio;
int use_mmio;
......
......@@ -56,7 +56,7 @@ static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id
{
struct address_info *hw_config;
unsigned long base;
void *mem;
void __iomem *mem;
unsigned long io;
u16 map;
u8 irq, dma8, dma16;
......
......@@ -60,7 +60,7 @@ struct nm256_info
/* Physical address of the port. */
u32 physaddr;
/* Our mapped-in pointer. */
char *ptr;
char __iomem *ptr;
/* PTR's offset within the physical port. */
u32 start_offset;
/* And the offset of the end of the buffer. */
......@@ -233,14 +233,14 @@ extern int nm256_debug;
static inline int nm256_writePort##X (struct nm256_info *card,\
int port, int offset, int value)\
{\
u##X *addr;\
u##X __iomem *addr;\
\
if (nm256_debug > 1)\
printk (KERN_DEBUG "Writing 0x%x to %d:0x%x\n", value, port, offset);\
\
NM_FIX_PORT;\
\
addr = (u##X *)(card->port[port - 1].ptr + offset);\
addr = (u##X __iomem *)(card->port[port - 1].ptr + offset);\
func (value, addr);\
return 0;\
}
......@@ -253,11 +253,11 @@ DEFwritePortX (32, writel)
static inline u##X nm256_readPort##X (struct nm256_info *card,\
int port, int offset)\
{\
u##X *addr;\
u##X __iomem *addr;\
\
NM_FIX_PORT\
\
addr = (u##X *)(card->port[port - 1].ptr + offset);\
addr = (u##X __iomem *)(card->port[port - 1].ptr + offset);\
return func(addr);\
}
......
......@@ -1011,7 +1011,7 @@ nm256_peek_for_sig (struct nm256_info *card)
u32 port1offset
= card->port[0].physaddr + card->port[0].end_offset - 0x0400;
/* The signature is located 1K below the end of video RAM. */
char *temp = ioremap_nocache (port1offset, 16);
char __iomem *temp = ioremap_nocache (port1offset, 16);
/* Default buffer end is 5120 bytes below the top of RAM. */
u32 default_value = card->port[0].end_offset - 0x1400;
u32 sig;
......
......@@ -273,7 +273,7 @@ typedef struct _rme96xx_info {
/* hardware settings */
int magic;
struct pci_dev * pcidev; /* pci_dev structure */
unsigned long *iobase;
unsigned long __iomem *iobase;
unsigned int irq;
/* list of rme96xx devices */
......
......@@ -239,7 +239,7 @@ struct ymf_capture {
struct ymf_unit {
u8 rev; /* PCI revision */
void *reg_area_virt;
void __iomem *reg_area_virt;
void *dma_area_va;
dma_addr_t dma_area_ba;
unsigned int dma_area_size;
......
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