Commit 4f5f573e authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] drivers/media annotations

trivial iomem annotations
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c083a79a
......@@ -102,7 +102,7 @@ struct bt878 {
unsigned char revision;
unsigned int irq;
unsigned long bt878_adr;
unsigned char *bt878_mem; /* function 1 */
volatile void __iomem *bt878_mem; /* function 1 */
volatile u32 finished_block;
volatile u32 last_block;
......@@ -129,17 +129,17 @@ void bt878_start(struct bt878 *bt, u32 controlreg, u32 op_sync_orin,
void bt878_stop(struct bt878 *bt);
#if defined(__powerpc__) /* big-endian */
extern __inline__ void io_st_le32(volatile unsigned *addr, unsigned val)
extern __inline__ void io_st_le32(volatile unsigned __iomem *addr, unsigned val)
{
__asm__ __volatile__("stwbrx %1,0,%2":"=m"(*addr):"r"(val),
"r"(addr));
__asm__ __volatile__("eieio":::"memory");
}
#define bmtwrite(dat,adr) io_st_le32((unsigned *)(adr),(dat))
#define bmtread(adr) ld_le32((unsigned *)(adr))
#define bmtwrite(dat,adr) io_st_le32((adr),(dat))
#define bmtread(adr) ld_le32((adr))
#else
#define bmtwrite(dat,adr) writel((dat), (char *) (adr))
#define bmtwrite(dat,adr) writel((dat), (adr))
#define bmtread(adr) readl(adr)
#endif
......
......@@ -293,7 +293,7 @@ struct bttv {
/* pci device config */
unsigned short id;
unsigned char revision;
unsigned char *bt848_mmio; /* pointer to mmio */
unsigned char __iomem *bt848_mmio; /* pointer to mmio */
/* card configuration info */
unsigned int cardid; /* pci subsystem id (bt878 based ones) */
......@@ -407,7 +407,7 @@ struct bttv {
#endif
#define btwrite(dat,adr) writel((dat), (char *) (btv->bt848_mmio+(adr)))
#define btwrite(dat,adr) writel((dat), btv->bt848_mmio+(adr))
#define btread(adr) readl(btv->bt848_mmio+(adr))
#define btand(dat,adr) btwrite((dat) & btread(adr), adr)
......
......@@ -1121,7 +1121,7 @@ struct cx88_core* cx88_core_get(struct pci_dev *pci)
cx88_pci_quirks(core->name, pci);
core->lmmio = ioremap(pci_resource_start(pci,0),
pci_resource_len(pci,0));
core->bmmio = (u8*)core->lmmio;
core->bmmio = (u8 __iomem *)core->lmmio;
/* board config */
core->board = UNSET;
......
......@@ -235,8 +235,8 @@ struct cx88_core {
/* pci stuff */
int pci_bus;
int pci_slot;
u32 *lmmio;
u8 *bmmio;
u32 __iomem *lmmio;
u8 __iomem *bmmio;
u32 shadow[SHADOW_MAX];
/* i2c i/o */
......
......@@ -292,7 +292,7 @@ struct meye {
u8 mchip_irq; /* irq */
u8 mchip_mode; /* actual mchip mode: HIC_MODE... */
u8 mchip_fnum; /* current mchip frame number */
unsigned char *mchip_mmregs; /* mchip: memory mapped registers */
unsigned char __iomem *mchip_mmregs;/* mchip: memory mapped registers */
u8 *mchip_ptable[MCHIP_NB_PAGES];/* mchip: ptable */
dma_addr_t *mchip_ptable_toc; /* mchip: ptable toc */
dma_addr_t mchip_dmahandle; /* mchip: dma handle to ptable toc */
......
......@@ -906,7 +906,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
goto fail1;
}
dev->lmmio = ioremap(pci_resource_start(pci_dev,0), 0x1000);
dev->bmmio = (__u8*)dev->lmmio;
dev->bmmio = (__u8 __iomem *)dev->lmmio;
if (NULL == dev->lmmio) {
err = -EIO;
printk(KERN_ERR "%s: can't ioremap() MMIO memory\n",
......
......@@ -382,8 +382,8 @@ struct saa7134_dev {
int nr;
struct pci_dev *pci;
unsigned char pci_rev,pci_lat;
__u32 *lmmio;
__u8 *bmmio;
__u32 __iomem *lmmio;
__u8 __iomem *bmmio;
/* config info */
unsigned int board;
......
......@@ -78,7 +78,7 @@ struct saa7146
unsigned char boardcfg[64]; /* 64 bytes of config from eeprom */
unsigned long saa7146_adr; /* bus address of IO mem from PCI BIOS */
struct saa7146_window win;
unsigned char *saa7146_mem; /* pointer to mapped IO memory */
unsigned char __iomem *saa7146_mem; /* pointer to mapped IO memory */
struct device_open open_data[MAX_OPENS];
#define MAX_MARKS 16
/* for a/v sync */
......@@ -95,10 +95,10 @@ struct saa7146
#endif
#ifdef _ALPHA_SAA7146
#define saawrite(dat,adr) writel((dat),(char *) (saa->saa7146_adr+(adr)))
#define saawrite(dat,adr) writel((dat), saa->saa7146_adr+(adr))
#define saaread(adr) readl(saa->saa7146_adr+(adr))
#else
#define saawrite(dat,adr) writel((dat), (char *) (saa->saa7146_mem+(adr)))
#define saawrite(dat,adr) writel((dat), saa->saa7146_mem+(adr))
#define saaread(adr) readl(saa->saa7146_mem+(adr))
#endif
......
......@@ -407,7 +407,7 @@ struct zoran {
struct pci_dev *pci_dev; /* PCI device */
unsigned char revision; /* revision of zr36057 */
unsigned int zr36057_adr; /* bus address of IO mem returned by PCI BIOS */
unsigned char *zr36057_mem; /* pointer to mapped IO memory */
unsigned char __iomem *zr36057_mem;/* pointer to mapped IO memory */
spinlock_t spinlock; /* Spinlock */
......@@ -499,10 +499,10 @@ struct zoran {
of _ALPHA_BUZ in the Makefile.*/
#ifdef _ALPHA_BUZ
#define btwrite(dat,adr) writel((dat),(char *) (zr->zr36057_adr+(adr)))
#define btwrite(dat,adr) writel((dat), zr->zr36057_adr+(adr))
#define btread(adr) readl(zr->zr36057_adr+(adr))
#else
#define btwrite(dat,adr) writel((dat), (char *) (zr->zr36057_mem+(adr)))
#define btwrite(dat,adr) writel((dat), zr->zr36057_mem+(adr))
#define btread(adr) readl(zr->zr36057_mem+(adr))
#endif
......
......@@ -265,7 +265,7 @@ get_high_mem (unsigned long size)
* if more than one driver at a time has the idea to use this memory!!!!
*/
volatile unsigned char *mem;
volatile unsigned char __iomem *mem;
unsigned char c;
unsigned long hi_mem_ph;
unsigned long i;
......@@ -299,7 +299,7 @@ get_high_mem (unsigned long size)
schedule();
}
iounmap((void *) mem);
iounmap(mem);
if (i != size) {
dprintk(1,
......
......@@ -123,7 +123,7 @@ struct saa7146_dev
spinlock_t slock;
struct semaphore lock;
unsigned char *mem; /* pointer to mapped IO memory */
unsigned char __iomem *mem; /* pointer to mapped IO memory */
int revision; /* chip revision; needed for bug-workarounds*/
/* pci-device & irq stuff*/
......
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