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

[PATCH] iomem annotations (sata_promise) 



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

drivers/scsi/sata_promise.c

+4 −4
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg) 
{

	if (sc_reg > SCR_CONTROL)

		return 0xffffffffU;

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

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

}
@@ -333,7 +333,7 @@ static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, 
{

	if (sc_reg > SCR_CONTROL)

		return;

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

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

}



static void pdc_qc_prep(struct ata_queued_cmd *qc)
@@ -523,8 +523,8 @@ static inline void pdc_packet_start(struct ata_queued_cmd *qc) 


	pp->pkt[2] = seq;

	wmb();			/* flush PRD, pkt writes */

	writel(pp->pkt_dma, (void *) ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT);

	readl((void *) ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT); /* flush */

	writel(pp->pkt_dma, (void __iomem *) ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT);

	readl((void __iomem *) ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT); /* flush */

}



static int pdc_qc_issue_prot(struct ata_queued_cmd *qc)