diff options
| author | Tejun Heo <htejun@gmail.com> | 2007-02-01 15:06:36 +0900 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-09 17:39:38 -0500 |
| commit | 0d5ff566779f894ca9937231a181eb31e4adff0e (patch) | |
| tree | d1c7495c932581c1d41aa7f0fdb303348da49106 /drivers/ata/pata_marvell.c | |
| parent | 1a68ff13c8a9b517de3fd4187dc525412a6eba1b (diff) | |
| download | blackbird-obmc-linux-0d5ff566779f894ca9937231a181eb31e4adff0e.tar.gz blackbird-obmc-linux-0d5ff566779f894ca9937231a181eb31e4adff0e.zip | |
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/pata_marvell.c')
| -rw-r--r-- | drivers/ata/pata_marvell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index 0a4409546a02..586cbb750c99 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c @@ -57,7 +57,7 @@ static int marvell_pre_reset(struct ata_port *ap) switch(ap->port_no) { case 0: - if (inb(ap->ioaddr.bmdma_addr + 1) & 1) + if (ioread8(ap->ioaddr.bmdma_addr + 1) & 1) ap->cbl = ATA_CBL_PATA40; else ap->cbl = ATA_CBL_PATA80; @@ -129,7 +129,7 @@ static const struct ata_port_operations marvell_ops = { .bmdma_status = ata_bmdma_status, .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, - .data_xfer = ata_pio_data_xfer, + .data_xfer = ata_data_xfer, /* Timeout handling */ .irq_handler = ata_interrupt, |
