diff options
| author | Johannes Stezenbach <devnull@localhost> | 2004-12-02 17:40:50 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2004-12-02 17:40:50 +0000 |
| commit | 7e603b49663feb3eb48364641562489c3373b1b0 (patch) | |
| tree | 57a9b836e40fce686007f7049e046691156667de /linux | |
| parent | 6d08891a0dde650c1f05dfabbcebc676f371f1a3 (diff) | |
| download | mediapointer-dvb-s2-7e603b49663feb3eb48364641562489c3373b1b0.tar.gz mediapointer-dvb-s2-7e603b49663feb3eb48364641562489c3373b1b0.tar.bz2 | |
another __iomem / cast-cleanup patch from mainline kernel
sent by C.Y.M
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/bt878.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/bt878.h b/linux/drivers/media/dvb/bt8xx/bt878.h index 22cbdffe6..22fa5211c 100644 --- a/linux/drivers/media/dvb/bt8xx/bt878.h +++ b/linux/drivers/media/dvb/bt8xx/bt878.h @@ -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 |