OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[libata] sata_svw, sata_vsc: kill iomem warnings 

Now that iomap merge is close to reality, and since the warnings and
issue have been around so long, we don't need a reminder on every build
that libata needs to be converted over to iomap.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Jeff Garzik 2006-12-20 14:37:04 -05:00
parent 2e5704f63e
commit 850a9d8a8b
2 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/ata/sata_svw.c
View File

@ -135,26 +135,31 @@ static void k2_sata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR; unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
if (tf->ctl != ap->last_ctl) { if (tf->ctl != ap->last_ctl) {
writeb(tf->ctl, ioaddr->ctl_addr); writeb(tf->ctl, (void __iomem *) ioaddr->ctl_addr);
ap->last_ctl = tf->ctl; ap->last_ctl = tf->ctl;
ata_wait_idle(ap); ata_wait_idle(ap);
} }
if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) { if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
writew(tf->feature | (((u16)tf->hob_feature) << 8), ioaddr->feature_addr); writew(tf->feature | (((u16)tf->hob_feature) << 8),
writew(tf->nsect | (((u16)tf->hob_nsect) << 8), ioaddr->nsect_addr); (void __iomem *) ioaddr->feature_addr);
writew(tf->lbal | (((u16)tf->hob_lbal) << 8), ioaddr->lbal_addr); writew(tf->nsect | (((u16)tf->hob_nsect) << 8),
writew(tf->lbam | (((u16)tf->hob_lbam) << 8), ioaddr->lbam_addr); (void __iomem *) ioaddr->nsect_addr);
writew(tf->lbah | (((u16)tf->hob_lbah) << 8), ioaddr->lbah_addr); writew(tf->lbal | (((u16)tf->hob_lbal) << 8),
(void __iomem *) ioaddr->lbal_addr);
writew(tf->lbam | (((u16)tf->hob_lbam) << 8),
(void __iomem *) ioaddr->lbam_addr);
writew(tf->lbah | (((u16)tf->hob_lbah) << 8),
(void __iomem *) ioaddr->lbah_addr);
} else if (is_addr) { } else if (is_addr) {
writew(tf->feature, ioaddr->feature_addr); writew(tf->feature, (void __iomem *) ioaddr->feature_addr);
writew(tf->nsect, ioaddr->nsect_addr); writew(tf->nsect, (void __iomem *) ioaddr->nsect_addr);
writew(tf->lbal, ioaddr->lbal_addr); writew(tf->lbal, (void __iomem *) ioaddr->lbal_addr);
writew(tf->lbam, ioaddr->lbam_addr); writew(tf->lbam, (void __iomem *) ioaddr->lbam_addr);
writew(tf->lbah, ioaddr->lbah_addr); writew(tf->lbah, (void __iomem *) ioaddr->lbah_addr);
} }
if (tf->flags & ATA_TFLAG_DEVICE) if (tf->flags & ATA_TFLAG_DEVICE)
writeb(tf->device, ioaddr->device_addr); writeb(tf->device, (void __iomem *) ioaddr->device_addr);
ata_wait_idle(ap); ata_wait_idle(ap);
} }
@ -166,12 +171,12 @@ static void k2_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
u16 nsect, lbal, lbam, lbah, feature; u16 nsect, lbal, lbam, lbah, feature;
tf->command = k2_stat_check_status(ap); tf->command = k2_stat_check_status(ap);
tf->device = readw(ioaddr->device_addr); tf->device = readw((void __iomem *)ioaddr->device_addr);
feature = readw(ioaddr->error_addr); feature = readw((void __iomem *)ioaddr->error_addr);
nsect = readw(ioaddr->nsect_addr); nsect = readw((void __iomem *)ioaddr->nsect_addr);
lbal = readw(ioaddr->lbal_addr); lbal = readw((void __iomem *)ioaddr->lbal_addr);
lbam = readw(ioaddr->lbam_addr); lbam = readw((void __iomem *)ioaddr->lbam_addr);
lbah = readw(ioaddr->lbah_addr); lbah = readw((void __iomem *)ioaddr->lbah_addr);
tf->feature = feature; tf->feature = feature;
tf->nsect = nsect; tf->nsect = nsect;

43
drivers/ata/sata_vsc.c
View File

@ -149,21 +149,26 @@ static void vsc_sata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
vsc_intr_mask_update(ap, tf->ctl & ATA_NIEN); vsc_intr_mask_update(ap, tf->ctl & ATA_NIEN);
} }
if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) { if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
writew(tf->feature | (((u16)tf->hob_feature) << 8), ioaddr->feature_addr); writew(tf->feature | (((u16)tf->hob_feature) << 8),
writew(tf->nsect | (((u16)tf->hob_nsect) << 8), ioaddr->nsect_addr); (void __iomem *) ioaddr->feature_addr);
writew(tf->lbal | (((u16)tf->hob_lbal) << 8), ioaddr->lbal_addr); writew(tf->nsect | (((u16)tf->hob_nsect) << 8),
writew(tf->lbam | (((u16)tf->hob_lbam) << 8), ioaddr->lbam_addr); (void __iomem *) ioaddr->nsect_addr);
writew(tf->lbah | (((u16)tf->hob_lbah) << 8), ioaddr->lbah_addr); writew(tf->lbal | (((u16)tf->hob_lbal) << 8),
(void __iomem *) ioaddr->lbal_addr);
writew(tf->lbam | (((u16)tf->hob_lbam) << 8),
(void __iomem *) ioaddr->lbam_addr);
writew(tf->lbah | (((u16)tf->hob_lbah) << 8),
(void __iomem *) ioaddr->lbah_addr);
} else if (is_addr) { } else if (is_addr) {
writew(tf->feature, ioaddr->feature_addr); writew(tf->feature, (void __iomem *) ioaddr->feature_addr);
writew(tf->nsect, ioaddr->nsect_addr); writew(tf->nsect, (void __iomem *) ioaddr->nsect_addr);
writew(tf->lbal, ioaddr->lbal_addr); writew(tf->lbal, (void __iomem *) ioaddr->lbal_addr);
writew(tf->lbam, ioaddr->lbam_addr); writew(tf->lbam, (void __iomem *) ioaddr->lbam_addr);
writew(tf->lbah, ioaddr->lbah_addr); writew(tf->lbah, (void __iomem *) ioaddr->lbah_addr);
} }
if (tf->flags & ATA_TFLAG_DEVICE) if (tf->flags & ATA_TFLAG_DEVICE)
writeb(tf->device, ioaddr->device_addr); writeb(tf->device, (void __iomem *) ioaddr->device_addr);
ata_wait_idle(ap); ata_wait_idle(ap);
} }
@ -175,12 +180,12 @@ static void vsc_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
u16 nsect, lbal, lbam, lbah, feature; u16 nsect, lbal, lbam, lbah, feature;
tf->command = ata_check_status(ap); tf->command = ata_check_status(ap);
tf->device = readw(ioaddr->device_addr); tf->device = readw((void __iomem *) ioaddr->device_addr);
feature = readw(ioaddr->error_addr); feature = readw((void __iomem *) ioaddr->error_addr);
nsect = readw(ioaddr->nsect_addr); nsect = readw((void __iomem *) ioaddr->nsect_addr);
lbal = readw(ioaddr->lbal_addr); lbal = readw((void __iomem *) ioaddr->lbal_addr);
lbam = readw(ioaddr->lbam_addr); lbam = readw((void __iomem *) ioaddr->lbam_addr);
lbah = readw(ioaddr->lbah_addr); lbah = readw((void __iomem *) ioaddr->lbah_addr);
tf->feature = feature; tf->feature = feature;
tf->nsect = nsect; tf->nsect = nsect;
@ -327,8 +332,8 @@ static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned lon
port->ctl_addr = base + VSC_SATA_TF_CTL_OFFSET; port->ctl_addr = base + VSC_SATA_TF_CTL_OFFSET;
port->bmdma_addr = base + VSC_SATA_DMA_CMD_OFFSET; port->bmdma_addr = base + VSC_SATA_DMA_CMD_OFFSET;
port->scr_addr = base + VSC_SATA_SCR_STATUS_OFFSET; port->scr_addr = base + VSC_SATA_SCR_STATUS_OFFSET;
writel(0, base + VSC_SATA_UP_DESCRIPTOR_OFFSET); writel(0, (void __iomem *) base + VSC_SATA_UP_DESCRIPTOR_OFFSET);
writel(0, base + VSC_SATA_UP_DATA_BUFFER_OFFSET); writel(0, (void __iomem *) base + VSC_SATA_UP_DATA_BUFFER_OFFSET);
} }