Skip to contentSkip to conversation

bt8xx cleanup

PATCH C.Y.M 1 participant 1 message Dec 2, 2004 Media (V4L/DVB)

lore
Share & tools
lore

C.Y.M

author
#0 lore raw

Since you just applied those other cleanups from 2.6.10-rc2-bk15, here is one more you might want to add. Thanks.

drivers/media/dvb/bt8xx/bt878.h 2004-11-19 05:52:47 -08:00 renamed from drivers/media/dvb/bt8xx/bt878.h 2004-10-20 08:19:52 -07:00 +5 -5
diff -Nru a/drivers/media/dvb/bt8xx/bt878.h b/drivers/media/dvb/bt8xx/bt878.h
@@ -102,7 +102,7 @@
        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_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