aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/ata_generic.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-02-01 01:06:36 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-09 17:39:38 -0500
commit0d5ff566779f894ca9937231a181eb31e4adff0e (patch)
treed1c7495c932581c1d41aa7f0fdb303348da49106 /drivers/ata/ata_generic.c
parent1a68ff13c8a9b517de3fd4187dc525412a6eba1b (diff)
libata: convert to iomap
Convert libata core layer and LLDs to use iomap. * managed iomap is used. Pointer to pcim_iomap_table() is cached at host->iomap and used through out LLDs. This basically replaces host->mmio_base. * if possible, pcim_iomap_regions() is used Most iomap operation conversions are taken from Jeff Garzik <jgarzik@pobox.com>'s iomap branch. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/ata_generic.c')
-rw-r--r--drivers/ata/ata_generic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index a25cbd653b0c..c79887f31841 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -79,7 +79,7 @@ static int generic_set_mode(struct ata_port *ap, struct ata_device **unused)
79 79
80 /* Bits 5 and 6 indicate if DMA is active on master/slave */ 80 /* Bits 5 and 6 indicate if DMA is active on master/slave */
81 if (ap->ioaddr.bmdma_addr) 81 if (ap->ioaddr.bmdma_addr)
82 dma_enabled = inb(ap->ioaddr.bmdma_addr + ATA_DMA_CMD); 82 dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_CMD);
83 83
84 for (i = 0; i < ATA_MAX_DEVICES; i++) { 84 for (i = 0; i < ATA_MAX_DEVICES; i++) {
85 struct ata_device *dev = &ap->device[i]; 85 struct ata_device *dev = &ap->device[i];
@@ -138,7 +138,7 @@ static struct ata_port_operations generic_port_ops = {
138 .bmdma_stop = ata_bmdma_stop, 138 .bmdma_stop = ata_bmdma_stop,
139 .bmdma_status = ata_bmdma_status, 139 .bmdma_status = ata_bmdma_status,
140 140
141 .data_xfer = ata_pio_data_xfer, 141 .data_xfer = ata_data_xfer,
142 142
143 .freeze = ata_bmdma_freeze, 143 .freeze = ata_bmdma_freeze,
144 .thaw = ata_bmdma_thaw, 144 .thaw = ata_bmdma_thaw,