diff options
author | Tejun Heo <htejun@gmail.com> | 2007-02-01 01:06:36 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-09 17:39:38 -0500 |
commit | 0d5ff566779f894ca9937231a181eb31e4adff0e (patch) | |
tree | d1c7495c932581c1d41aa7f0fdb303348da49106 /drivers/ata/pata_hpt3x2n.c | |
parent | 1a68ff13c8a9b517de3fd4187dc525412a6eba1b (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/pata_hpt3x2n.c')
-rw-r--r-- | drivers/ata/pata_hpt3x2n.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c index 9f8ec576317c..b56dc4a7185b 100644 --- a/drivers/ata/pata_hpt3x2n.c +++ b/drivers/ata/pata_hpt3x2n.c | |||
@@ -263,26 +263,26 @@ static void hpt3x2n_bmdma_stop(struct ata_queued_cmd *qc) | |||
263 | 263 | ||
264 | static void hpt3x2n_set_clock(struct ata_port *ap, int source) | 264 | static void hpt3x2n_set_clock(struct ata_port *ap, int source) |
265 | { | 265 | { |
266 | unsigned long bmdma = ap->ioaddr.bmdma_addr; | 266 | void __iomem *bmdma = ap->ioaddr.bmdma_addr; |
267 | 267 | ||
268 | /* Tristate the bus */ | 268 | /* Tristate the bus */ |
269 | outb(0x80, bmdma+0x73); | 269 | iowrite8(0x80, bmdma+0x73); |
270 | outb(0x80, bmdma+0x77); | 270 | iowrite8(0x80, bmdma+0x77); |
271 | 271 | ||
272 | /* Switch clock and reset channels */ | 272 | /* Switch clock and reset channels */ |
273 | outb(source, bmdma+0x7B); | 273 | iowrite8(source, bmdma+0x7B); |
274 | outb(0xC0, bmdma+0x79); | 274 | iowrite8(0xC0, bmdma+0x79); |
275 | 275 | ||
276 | /* Reset state machines */ | 276 | /* Reset state machines */ |
277 | outb(0x37, bmdma+0x70); | 277 | iowrite8(0x37, bmdma+0x70); |
278 | outb(0x37, bmdma+0x74); | 278 | iowrite8(0x37, bmdma+0x74); |
279 | 279 | ||
280 | /* Complete reset */ | 280 | /* Complete reset */ |
281 | outb(0x00, bmdma+0x79); | 281 | iowrite8(0x00, bmdma+0x79); |
282 | 282 | ||
283 | /* Reconnect channels to bus */ | 283 | /* Reconnect channels to bus */ |
284 | outb(0x00, bmdma+0x73); | 284 | iowrite8(0x00, bmdma+0x73); |
285 | outb(0x00, bmdma+0x77); | 285 | iowrite8(0x00, bmdma+0x77); |
286 | } | 286 | } |
287 | 287 | ||
288 | /* Check if our partner interface is busy */ | 288 | /* Check if our partner interface is busy */ |
@@ -373,7 +373,7 @@ static struct ata_port_operations hpt3x2n_port_ops = { | |||
373 | .qc_prep = ata_qc_prep, | 373 | .qc_prep = ata_qc_prep, |
374 | .qc_issue = hpt3x2n_qc_issue_prot, | 374 | .qc_issue = hpt3x2n_qc_issue_prot, |
375 | 375 | ||
376 | .data_xfer = ata_pio_data_xfer, | 376 | .data_xfer = ata_data_xfer, |
377 | 377 | ||
378 | .irq_handler = ata_interrupt, | 378 | .irq_handler = ata_interrupt, |
379 | .irq_clear = ata_bmdma_irq_clear, | 379 | .irq_clear = ata_bmdma_irq_clear, |