|
@@ -107,7 +107,7 @@ static u32 k2_sata_scr_read (struct ata_port *ap, unsigned int sc_reg)
|
|
|
{
|
|
|
if (sc_reg > SCR_CONTROL)
|
|
|
return 0xffffffffU;
|
|
|
- return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
|
|
|
+ return readl(ap->ioaddr.scr_addr + (sc_reg * 4));
|
|
|
}
|
|
|
|
|
|
|
|
@@ -116,7 +116,7 @@ static void k2_sata_scr_write (struct ata_port *ap, unsigned int sc_reg,
|
|
|
{
|
|
|
if (sc_reg > SCR_CONTROL)
|
|
|
return;
|
|
|
- writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
|
|
|
+ writel(val, ap->ioaddr.scr_addr + (sc_reg * 4));
|
|
|
}
|
|
|
|
|
|
|
|
@@ -197,7 +197,8 @@ static void k2_bmdma_setup_mmio (struct ata_queued_cmd *qc)
|
|
|
struct ata_port *ap = qc->ap;
|
|
|
unsigned int rw = (qc->tf.flags & ATA_TFLAG_WRITE);
|
|
|
u8 dmactl;
|
|
|
- void __iomem *mmio = (void __iomem *) ap->ioaddr.bmdma_addr;
|
|
|
+ void __iomem *mmio = ap->ioaddr.bmdma_addr;
|
|
|
+
|
|
|
/* load PRD table addr. */
|
|
|
mb(); /* make sure PRD table writes are visible to controller */
|
|
|
writel(ap->prd_dma, mmio + ATA_DMA_TABLE_OFS);
|
|
@@ -225,7 +226,7 @@ static void k2_bmdma_setup_mmio (struct ata_queued_cmd *qc)
|
|
|
static void k2_bmdma_start_mmio (struct ata_queued_cmd *qc)
|
|
|
{
|
|
|
struct ata_port *ap = qc->ap;
|
|
|
- void __iomem *mmio = (void __iomem *) ap->ioaddr.bmdma_addr;
|
|
|
+ void __iomem *mmio = ap->ioaddr.bmdma_addr;
|
|
|
u8 dmactl;
|
|
|
|
|
|
/* start host DMA transaction */
|
|
@@ -253,7 +254,7 @@ static void k2_bmdma_start_mmio (struct ata_queued_cmd *qc)
|
|
|
|
|
|
static u8 k2_stat_check_status(struct ata_port *ap)
|
|
|
{
|
|
|
- return readl((void __iomem *) ap->ioaddr.status_addr);
|
|
|
+ return readl(ap->ioaddr.status_addr);
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_PPC_OF
|