X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fi2c%2Fbusses%2Fi2c-keywest.h;h=c5022e1ca6ff192671a470062e21f67e3cfa44a3;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=ecc279d5ccae338f90518d674c0b94c27a458206;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/i2c/busses/i2c-keywest.h b/drivers/i2c/busses/i2c-keywest.h index ecc279d5c..c5022e1ca 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; - unsigned long base; + void __iomem * 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(((volatile u8 *)iface->base) + return in_8(iface->base + (((unsigned)reg) << iface->bsteps)); } static inline void __write_reg(struct keywest_iface *iface, reg_t reg, u8 val) { - out_8(((volatile u8 *)iface->base) + out_8(iface->base + (((unsigned)reg) << iface->bsteps), val); (void)__read_reg(iface, reg_subaddr); }