diff options
Diffstat (limited to 'drivers/ata/sata_svw.c')
-rw-r--r-- | drivers/ata/sata_svw.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index bcb2cd8b063d..4fd4f107187c 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
@@ -107,7 +107,7 @@ static u32 k2_sata_scr_read (struct ata_port *ap, unsigned int sc_reg) | |||
107 | { | 107 | { |
108 | if (sc_reg > SCR_CONTROL) | 108 | if (sc_reg > SCR_CONTROL) |
109 | return 0xffffffffU; | 109 | return 0xffffffffU; |
110 | return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4)); | 110 | return readl(ap->ioaddr.scr_addr + (sc_reg * 4)); |
111 | } | 111 | } |
112 | 112 | ||
113 | 113 | ||
@@ -116,7 +116,7 @@ static void k2_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, | |||
116 | { | 116 | { |
117 | if (sc_reg > SCR_CONTROL) | 117 | if (sc_reg > SCR_CONTROL) |
118 | return; | 118 | return; |
119 | writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4)); | 119 | writel(val, ap->ioaddr.scr_addr + (sc_reg * 4)); |
120 | } | 120 | } |
121 | 121 | ||
122 | 122 | ||
@@ -197,7 +197,8 @@ static void k2_bmdma_setup_mmio (struct ata_queued_cmd *qc) | |||
197 | struct ata_port *ap = qc->ap; | 197 | struct ata_port *ap = qc->ap; |
198 | unsigned int rw = (qc->tf.flags & ATA_TFLAG_WRITE); | 198 | unsigned int rw = (qc->tf.flags & ATA_TFLAG_WRITE); |
199 | u8 dmactl; | 199 | u8 dmactl; |
200 | void __iomem *mmio = (void __iomem *) ap->ioaddr.bmdma_addr; | 200 | void __iomem *mmio = ap->ioaddr.bmdma_addr; |
201 | |||
201 | /* load PRD table addr. */ | 202 | /* load PRD table addr. */ |
202 | mb(); /* make sure PRD table writes are visible to controller */ | 203 | mb(); /* make sure PRD table writes are visible to controller */ |
203 | writel(ap->prd_dma, mmio + ATA_DMA_TABLE_OFS); | 204 | writel(ap->prd_dma, mmio + ATA_DMA_TABLE_OFS); |
@@ -225,7 +226,7 @@ static void k2_bmdma_setup_mmio (struct ata_queued_cmd *qc) | |||
225 | static void k2_bmdma_start_mmio (struct ata_queued_cmd *qc) | 226 | static void k2_bmdma_start_mmio (struct ata_queued_cmd *qc) |
226 | { | 227 | { |
227 | struct ata_port *ap = qc->ap; | 228 | struct ata_port *ap = qc->ap; |
228 | void __iomem *mmio = (void __iomem *) ap->ioaddr.bmdma_addr; | 229 | void __iomem *mmio = ap->ioaddr.bmdma_addr; |
229 | u8 dmactl; | 230 | u8 dmactl; |
230 | 231 | ||
231 | /* start host DMA transaction */ | 232 | /* start host DMA transaction */ |
@@ -253,7 +254,7 @@ static void k2_bmdma_start_mmio (struct ata_queued_cmd *qc) | |||
253 | 254 | ||
254 | static u8 k2_stat_check_status(struct ata_port *ap) | 255 | static u8 k2_stat_check_status(struct ata_port *ap) |
255 | { | 256 | { |
256 | return readl((void __iomem *) ap->ioaddr.status_addr); | 257 | return readl(ap->ioaddr.status_addr); |
257 | } | 258 | } |
258 | 259 | ||
259 | #ifdef CONFIG_PPC_OF | 260 | #ifdef CONFIG_PPC_OF |