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

Commit 307e4dc2 authored by Al Viro's avatar Al Viro Committed by Jeff Garzik
Browse files

[PATCH] iomem annotations (sata_vsc) 



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

drivers/scsi/sata_vsc.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ static u32 vsc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg) 
{

{

	if (sc_reg > SCR_CONTROL)

	if (sc_reg > SCR_CONTROL)

		return 0xffffffffU;

		return 0xffffffffU;

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

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

}

}
@@ -95,16 +95,16 @@ static void vsc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, 
{

{

	if (sc_reg > SCR_CONTROL)

	if (sc_reg > SCR_CONTROL)

		return;

		return;

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

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

}

}









static void vsc_intr_mask_update(struct ata_port *ap, u8 ctl)

static void vsc_intr_mask_update(struct ata_port *ap, u8 ctl)

{

{

	unsigned long mask_addr;

	void __iomem *mask_addr;

	u8 mask;

	u8 mask;





	mask_addr = (unsigned long) ap->host_set->mmio_base +

	mask_addr = ap->host_set->mmio_base +

		VSC_SATA_INT_MASK_OFFSET + ap->port_no;

		VSC_SATA_INT_MASK_OFFSET + ap->port_no;

	mask = readb(mask_addr);

	mask = readb(mask_addr);

	if (ctl & ATA_NIEN)

	if (ctl & ATA_NIEN)
@@ -283,7 +283,7 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d 
	struct ata_probe_ent *probe_ent = NULL;

	struct ata_probe_ent *probe_ent = NULL;

	unsigned long base;

	unsigned long base;

	int pci_dev_busy = 0;

	int pci_dev_busy = 0;

	void *mmio_base;

	void __iomem *mmio_base;

	int rc;

	int rc;





	if (!printed_version++)

	if (!printed_version++)