[PATCH] ppc iomem annotations: pmac_low_i2c
From: Al Viro <hidden>
Date: 2005-04-25 06:04:24
Signed-off-by: Al Viro <redacted> ---- diff -urN RC12-rc3-ebony/arch/ppc/platforms/pmac_low_i2c.c RC12-rc3-ppc-i2c/arch/ppc/platforms/pmac_low_i2c.c
--- RC12-rc3-ebony/arch/ppc/platforms/pmac_low_i2c.c Fri Feb 6 22:04:13 2004
+++ RC12-rc3-ppc-i2c/arch/ppc/platforms/pmac_low_i2c.c Mon Apr 25 01:36:32 2005@@ -54,7 +54,7 @@ int mode; /* Current mode */ int channel; /* Current channel */ int num_channels; /* Number of channels */ - unsigned long base; /* For keywest-i2c, base address */ + void __iomem * base; /* For keywest-i2c, base address */ int bsteps; /* And register stepping */ int speed; /* And speed */ };
@@ -154,14 +154,12 @@ static inline u8 __kw_read_reg(struct low_i2c_host *host, reg_t reg) { - return in_8(((volatile u8 *)host->base) - + (((unsigned)reg) << host->bsteps)); + return in_8(host->base + (((unsigned)reg) << host->bsteps)); } static inline void __kw_write_reg(struct low_i2c_host *host, reg_t reg, u8 val) { - out_8(((volatile u8 *)host->base) - + (((unsigned)reg) << host->bsteps), val); + out_8(host->base + (((unsigned)reg) << host->bsteps), val); (void)__kw_read_reg(host, reg_subaddr); }
@@ -370,7 +368,7 @@ break; } host->mode = pmac_low_i2c_mode_std; - host->base = (unsigned long)ioremap(np->addrs[0].address + aoffset, + host->base = ioremap(np->addrs[0].address + aoffset, np->addrs[0].size); host->func = keywest_low_i2c_func; }