aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/xsysace.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-10-04 02:52:39 -0400
committerJens Axboe <axboe@carl.home.kernel.dk>2007-10-10 03:25:59 -0400
commitb5515d86f2efd4dd3516c16c17c1a611a5800b19 (patch)
treea3c4781981f17bff2587b0101ea4cee4de0b8d5d /drivers/block/xsysace.c
parent34e1b83413d91999416443f31c276095f9937aa6 (diff)
Sysace: sparse fixes
Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block/xsysace.c')
-rw-r--r--drivers/block/xsysace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 3847464f5ea6..5b73471ada78 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -195,7 +195,7 @@ struct ace_device {
195 195
196 /* Details of hardware device */ 196 /* Details of hardware device */
197 unsigned long physaddr; 197 unsigned long physaddr;
198 void *baseaddr; 198 void __iomem *baseaddr;
199 int irq; 199 int irq;
200 int bus_width; /* 0 := 8 bit; 1 := 16 bit */ 200 int bus_width; /* 0 := 8 bit; 1 := 16 bit */
201 struct ace_reg_ops *reg_ops; 201 struct ace_reg_ops *reg_ops;
@@ -227,20 +227,20 @@ struct ace_reg_ops {
227/* 8 Bit bus width */ 227/* 8 Bit bus width */
228static u16 ace_in_8(struct ace_device *ace, int reg) 228static u16 ace_in_8(struct ace_device *ace, int reg)
229{ 229{
230 void *r = ace->baseaddr + reg; 230 void __iomem *r = ace->baseaddr + reg;
231 return in_8(r) | (in_8(r + 1) << 8); 231 return in_8(r) | (in_8(r + 1) << 8);
232} 232}
233 233
234static void ace_out_8(struct ace_device *ace, int reg, u16 val) 234static void ace_out_8(struct ace_device *ace, int reg, u16 val)
235{ 235{
236 void *r = ace->baseaddr + reg; 236 void __iomem *r = ace->baseaddr + reg;
237 out_8(r, val); 237 out_8(r, val);
238 out_8(r + 1, val >> 8); 238 out_8(r + 1, val >> 8);
239} 239}
240 240
241static void ace_datain_8(struct ace_device *ace) 241static void ace_datain_8(struct ace_device *ace)
242{ 242{
243 void *r = ace->baseaddr + 0x40; 243 void __iomem *r = ace->baseaddr + 0x40;
244 u8 *dst = ace->data_ptr; 244 u8 *dst = ace->data_ptr;
245 int i = ACE_FIFO_SIZE; 245 int i = ACE_FIFO_SIZE;
246 while (i--) 246 while (i--)
@@ -250,7 +250,7 @@ static void ace_datain_8(struct ace_device *ace)
250 250
251static void ace_dataout_8(struct ace_device *ace) 251static void ace_dataout_8(struct ace_device *ace)
252{ 252{
253 void *r = ace->baseaddr + 0x40; 253 void __iomem *r = ace->baseaddr + 0x40;
254 u8 *src = ace->data_ptr; 254 u8 *src = ace->data_ptr;
255 int i = ACE_FIFO_SIZE; 255 int i = ACE_FIFO_SIZE;
256 while (i--) 256 while (i--)