aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-02-09 11:39:35 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 12:14:07 -0500
commit92ccc5f7558f24edf7129a24a8e2ce338009b0dd (patch)
treefb8641bd359d4c9418e65462f064d41e64ba01f7
parentcb468984f624959995f1034197f3bae86108973b (diff)
[PATCH] sata_svw: trivial iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/ata/sata_svw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index 46d8a94669b4..5f4e82ade6cd 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -116,7 +116,7 @@ static u32 k2_sata_scr_read (struct ata_port *ap, unsigned int sc_reg)
116{ 116{
117 if (sc_reg > SCR_CONTROL) 117 if (sc_reg > SCR_CONTROL)
118 return 0xffffffffU; 118 return 0xffffffffU;
119 return readl((void *) ap->ioaddr.scr_addr + (sc_reg * 4)); 119 return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
120} 120}
121 121
122 122
@@ -125,7 +125,7 @@ static void k2_sata_scr_write (struct ata_port *ap, unsigned int sc_reg,
125{ 125{
126 if (sc_reg > SCR_CONTROL) 126 if (sc_reg > SCR_CONTROL)
127 return; 127 return;
128 writel(val, (void *) ap->ioaddr.scr_addr + (sc_reg * 4)); 128 writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
129} 129}
130 130
131 131
@@ -262,7 +262,7 @@ static void k2_bmdma_start_mmio (struct ata_queued_cmd *qc)
262 262
263static u8 k2_stat_check_status(struct ata_port *ap) 263static u8 k2_stat_check_status(struct ata_port *ap)
264{ 264{
265 return readl((void *) ap->ioaddr.status_addr); 265 return readl((void __iomem *) ap->ioaddr.status_addr);
266} 266}
267 267
268#ifdef CONFIG_PPC_OF 268#ifdef CONFIG_PPC_OF