diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:05 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:05 -0500 |
commit | 1c029fd658baa2442e8e51dc9c819301cad95777 (patch) | |
tree | fbbfe6bb774001c9346ea0f772e5f4b0d469b989 /drivers/ide/ide.c | |
parent | 866664d79f6a920af07e6503f64366f4c5b2d41f (diff) |
ide: remove ->dma_master field from ide_hwif_t (take 5)
* Convert cmd64x, hpt366 and pdc202xx_old host drivers to use
pci_resource_start(hwif->pci_dev, 4) instead of hwif->dma_master.
* Remove no longer needed ->dma_master field from ide_hwif_t.
v2:
* Use the more readable 'hwif->dma_base - (hwif->channel * 8)' instead of
pci_resource_start(hwif->pci_dev, 4).
v3:
* Use hwif->extra_base in hpt366/pdc20xx_old + some cosmetic fixups over v2
(suggested by Sergei).
v4:
* Correct offsets in hpt3xxn_set_clock().
v5:
* Use hwif->extra_base in hpt366 for _real_ this time. (Noticed by Sergei)
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 54943da6e4e5..9ab5458fe950 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -468,7 +468,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif) | |||
468 | #endif | 468 | #endif |
469 | 469 | ||
470 | hwif->dma_base = tmp_hwif->dma_base; | 470 | hwif->dma_base = tmp_hwif->dma_base; |
471 | hwif->dma_master = tmp_hwif->dma_master; | ||
472 | hwif->dma_command = tmp_hwif->dma_command; | 471 | hwif->dma_command = tmp_hwif->dma_command; |
473 | hwif->dma_vendor1 = tmp_hwif->dma_vendor1; | 472 | hwif->dma_vendor1 = tmp_hwif->dma_vendor1; |
474 | hwif->dma_status = tmp_hwif->dma_status; | 473 | hwif->dma_status = tmp_hwif->dma_status; |
@@ -602,7 +601,6 @@ void ide_unregister(unsigned int index) | |||
602 | (void) ide_release_dma(hwif); | 601 | (void) ide_release_dma(hwif); |
603 | 602 | ||
604 | hwif->dma_base = 0; | 603 | hwif->dma_base = 0; |
605 | hwif->dma_master = 0; | ||
606 | hwif->dma_command = 0; | 604 | hwif->dma_command = 0; |
607 | hwif->dma_vendor1 = 0; | 605 | hwif->dma_vendor1 = 0; |
608 | hwif->dma_status = 0; | 606 | hwif->dma_status = 0; |