[PATCH] iomem annotations (ahci)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Родитель
9ee0c0a2cc
Коммит
1e4f2a96ae
|
@ -407,7 +407,7 @@ static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in)
|
||||||
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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -425,7 +425,7 @@ static void ahci_scr_write (struct ata_port *ap, unsigned int sc_reg_in,
|
||||||
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 ahci_phy_reset(struct ata_port *ap)
|
static void ahci_phy_reset(struct ata_port *ap)
|
||||||
|
@ -453,14 +453,14 @@ static void ahci_phy_reset(struct ata_port *ap)
|
||||||
|
|
||||||
static u8 ahci_check_status(struct ata_port *ap)
|
static u8 ahci_check_status(struct ata_port *ap)
|
||||||
{
|
{
|
||||||
void *mmio = (void *) ap->ioaddr.cmd_addr;
|
void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr;
|
||||||
|
|
||||||
return readl(mmio + PORT_TFDATA) & 0xFF;
|
return readl(mmio + PORT_TFDATA) & 0xFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u8 ahci_check_err(struct ata_port *ap)
|
static u8 ahci_check_err(struct ata_port *ap)
|
||||||
{
|
{
|
||||||
void *mmio = (void *) ap->ioaddr.cmd_addr;
|
void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr;
|
||||||
|
|
||||||
return (readl(mmio + PORT_TFDATA) >> 8) & 0xFF;
|
return (readl(mmio + PORT_TFDATA) >> 8) & 0xFF;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче