X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fi2c%2Fbusses%2Fi2c-keywest.h;h=ecc279d5ccae338f90518d674c0b94c27a458206;hb=a9fdee76789476a10f923f9fb3c84993042da3ac;hp=c5022e1ca6ff192671a470062e21f67e3cfa44a3;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git diff --git a/drivers/i2c/busses/i2c-keywest.h b/drivers/i2c/busses/i2c-keywest.h index c5022e1ca..ecc279d5c 100644 --- a/drivers/i2c/busses/i2c-keywest.h +++ b/drivers/i2c/busses/i2c-keywest.h @@ -52,7 +52,7 @@ typedef enum { struct keywest_iface { struct device_node *node; - void __iomem * base; + unsigned long base; unsigned bsteps; int irq; spinlock_t lock; @@ -89,13 +89,13 @@ struct keywest_chan static inline u8 __read_reg(struct keywest_iface *iface, reg_t reg) { - return in_8(iface->base + return in_8(((volatile u8 *)iface->base) + (((unsigned)reg) << iface->bsteps)); } static inline void __write_reg(struct keywest_iface *iface, reg_t reg, u8 val) { - out_8(iface->base + out_8(((volatile u8 *)iface->base) + (((unsigned)reg) << iface->bsteps), val); (void)__read_reg(iface, reg_subaddr); }