diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-10 17:45:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 18:37:21 -0400 |
commit | 04b1add1ab9121898b7d63570aad2a9c7ee9cfa3 (patch) | |
tree | 5b43c1a73f5169731f2bbee10b53834fe712e31f /drivers/ata | |
parent | 98ae6ccd8e15aeac1c624615c044deecf46a359a (diff) |
[PATCH] misc sata __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/sata_sil.c | 2 | ||||
-rw-r--r-- | drivers/ata/sata_svw.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index ae5edb80ea9a..ca8d99312472 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c | |||
@@ -349,7 +349,7 @@ static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg) | |||
349 | 349 | ||
350 | static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val) | 350 | static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val) |
351 | { | 351 | { |
352 | void *mmio = (void __iomem *) sil_scr_addr(ap, sc_reg); | 352 | void __iomem *mmio = (void __iomem *) sil_scr_addr(ap, sc_reg); |
353 | if (mmio) | 353 | if (mmio) |
354 | writel(val, mmio); | 354 | writel(val, mmio); |
355 | } | 355 | } |
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index 84025a2fd5be..db32d15b7fa1 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
@@ -177,7 +177,7 @@ static void k2_bmdma_setup_mmio (struct ata_queued_cmd *qc) | |||
177 | struct ata_port *ap = qc->ap; | 177 | struct ata_port *ap = qc->ap; |
178 | unsigned int rw = (qc->tf.flags & ATA_TFLAG_WRITE); | 178 | unsigned int rw = (qc->tf.flags & ATA_TFLAG_WRITE); |
179 | u8 dmactl; | 179 | u8 dmactl; |
180 | void *mmio = (void *) ap->ioaddr.bmdma_addr; | 180 | void __iomem *mmio = (void __iomem *) ap->ioaddr.bmdma_addr; |
181 | /* load PRD table addr. */ | 181 | /* load PRD table addr. */ |
182 | mb(); /* make sure PRD table writes are visible to controller */ | 182 | mb(); /* make sure PRD table writes are visible to controller */ |
183 | writel(ap->prd_dma, mmio + ATA_DMA_TABLE_OFS); | 183 | writel(ap->prd_dma, mmio + ATA_DMA_TABLE_OFS); |
@@ -205,7 +205,7 @@ static void k2_bmdma_setup_mmio (struct ata_queued_cmd *qc) | |||
205 | static void k2_bmdma_start_mmio (struct ata_queued_cmd *qc) | 205 | static void k2_bmdma_start_mmio (struct ata_queued_cmd *qc) |
206 | { | 206 | { |
207 | struct ata_port *ap = qc->ap; | 207 | struct ata_port *ap = qc->ap; |
208 | void *mmio = (void *) ap->ioaddr.bmdma_addr; | 208 | void __iomem *mmio = (void __iomem *) ap->ioaddr.bmdma_addr; |
209 | u8 dmactl; | 209 | u8 dmactl; |
210 | 210 | ||
211 | /* start host DMA transaction */ | 211 | /* start host DMA transaction */ |