Commit 04b1add1 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] misc sata __iomem annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 98ae6ccd

drivers/ata/sata_sil.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg) 


static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)

{

	void *mmio = (void __iomem *) sil_scr_addr(ap, sc_reg);

	void __iomem *mmio = (void __iomem *) sil_scr_addr(ap, sc_reg);

	if (mmio)

		writel(val, mmio);

}

drivers/ata/sata_svw.c

+2 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ 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 *mmio = (void *) ap->ioaddr.bmdma_addr;

	void __iomem *mmio = (void __iomem *) 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);
@@ -205,7 +205,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 *mmio = (void *) ap->ioaddr.bmdma_addr;

	void __iomem *mmio = (void __iomem *) ap->ioaddr.bmdma_addr;

	u8 dmactl;



	/* start host DMA transaction */