diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-01-06 11:20:50 -0500 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-01-06 11:20:50 -0500 |
| commit | b65fac32cfe3b2f98cd472fef400bd1c1340de23 (patch) | |
| tree | 493a7e30e23e5413a9e5ad6102b8e91ebc02c069 /drivers/ide/pmac.c | |
| parent | 5b31f855f10d0053e738baa6d91fb6a3fad35119 (diff) | |
ide: merge ide_hwgroup_t with ide_hwif_t (v2)
* Merge ide_hwgroup_t with ide_hwif_t.
* Cleanup init_irq() accordingly, then remove no longer needed
ide_remove_port_from_hwgroup() and ide_ports[].
* Remove now unused HWGROUP() macro.
While at it:
* ide_dump_ata_error() fixups
v2:
* Fix ->quirk_list check in do_ide_request()
(s/hwif->cur_dev/prev_port->cur_dev).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pmac.c')
| -rw-r--r-- | drivers/ide/pmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index 7c481bb56fab..899b96baf215 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c | |||
| @@ -1516,7 +1516,7 @@ pmac_ide_dma_setup(ide_drive_t *drive) | |||
| 1516 | ide_hwif_t *hwif = HWIF(drive); | 1516 | ide_hwif_t *hwif = HWIF(drive); |
| 1517 | pmac_ide_hwif_t *pmif = | 1517 | pmac_ide_hwif_t *pmif = |
| 1518 | (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); | 1518 | (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); |
| 1519 | struct request *rq = HWGROUP(drive)->rq; | 1519 | struct request *rq = hwif->rq; |
| 1520 | u8 unit = drive->dn & 1, ata4 = (pmif->kind == controller_kl_ata4); | 1520 | u8 unit = drive->dn & 1, ata4 = (pmif->kind == controller_kl_ata4); |
| 1521 | 1521 | ||
| 1522 | if (!pmac_ide_build_dmatable(drive, rq)) { | 1522 | if (!pmac_ide_build_dmatable(drive, rq)) { |