Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ee0c0a2 authored by Al Viro's avatar Al Viro Committed by Jeff Garzik
Browse files

[PATCH] iomem annotations (sata_nv) 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 7e6c1208

drivers/scsi/sata_nv.c

+2 −2
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static u32 nv_scr_read (struct ata_port *ap, unsigned int sc_reg) 
		return 0xffffffffU;



	if (host->host_flags & NV_HOST_FLAGS_SCR_MMIO)

		return readl((void*)ap->ioaddr.scr_addr + (sc_reg * 4));

		return readl((void __iomem *)ap->ioaddr.scr_addr + (sc_reg * 4));

	else

		return inl(ap->ioaddr.scr_addr + (sc_reg * 4));

}
@@ -345,7 +345,7 @@ static void nv_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val) 
		return;



	if (host->host_flags & NV_HOST_FLAGS_SCR_MMIO)

		writel(val, (void*)ap->ioaddr.scr_addr + (sc_reg * 4));

		writel(val, (void __iomem *)ap->ioaddr.scr_addr + (sc_reg * 4));

	else

		outl(val, ap->ioaddr.scr_addr + (sc_reg * 4));

}