From 1248fc43d8097c903ea32169b3aabda213e88d9f Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 21 Oct 2005 06:46:02 +0100 Subject: [PATCH] --- yaml --- r: 10367 b: refs/heads/master c: b181d3b0121e141cb410ea3126b4dbe4f8e1751a h: refs/heads/master i: 10365: 051502c58f697b3129b9bb9e7cba719ee5555572 10363: e99f2c69213e9d9c058809cd8aa0588135f559f8 10359: 6d455afcc811044c026ca166eb265e4c5c8cb84b 10351: 2adb02bb99116b442141dadd634a9bfc2584c5ee 10335: f051f6969629d254727edc6692fc81b15341a86c 10303: f22120a2ddb063e4a1cc2f37250944e5ff75bb57 10239: 12a740396ea23014a3b112b41ad11c8d6dfb2655 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sata_promise.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 49a4e55ce6b0..a538bdf83bbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e4f2a96aeb373000ccd783e0f5b40294b5e668a +refs/heads/master: b181d3b0121e141cb410ea3126b4dbe4f8e1751a diff --git a/trunk/drivers/scsi/sata_promise.c b/trunk/drivers/scsi/sata_promise.c index def7e0d9dacb..9bf8cbd29901 100644 --- a/trunk/drivers/scsi/sata_promise.c +++ b/trunk/drivers/scsi/sata_promise.c @@ -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)