diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-01-06 17:20:50 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-01-06 17:20:50 +0100 |
| commit | b65fac32cfe3b2f98cd472fef400bd1c1340de23 (patch) | |
| tree | 493a7e30e23e5413a9e5ad6102b8e91ebc02c069 /drivers/ide/ide.c | |
| parent | 5b31f855f10d0053e738baa6d91fb6a3fad35119 (diff) | |
| download | op-kernel-dev-b65fac32cfe3b2f98cd472fef400bd1c1340de23.zip op-kernel-dev-b65fac32cfe3b2f98cd472fef400bd1c1340de23.tar.gz | |
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/ide.c')
| -rw-r--r-- | drivers/ide/ide.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 5bc2e478..9e40328 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -189,8 +189,6 @@ void ide_unregister(ide_hwif_t *hwif) free_irq(hwif->irq, hwif); - ide_remove_port_from_hwgroup(hwif); - device_unregister(hwif->portdev); device_unregister(&hwif->gendev); wait_for_completion(&hwif->gendev_rel_comp); @@ -315,7 +313,6 @@ static int set_pio_mode_abuse(ide_hwif_t *hwif, u8 req_pio) static int set_pio_mode(ide_drive_t *drive, int arg) { ide_hwif_t *hwif = drive->hwif; - ide_hwgroup_t *hwgroup = hwif->hwgroup; const struct ide_port_ops *port_ops = hwif->port_ops; if (arg < 0 || arg > 255) @@ -330,9 +327,9 @@ static int set_pio_mode(ide_drive_t *drive, int arg) unsigned long flags; /* take lock for IDE_DFLAG_[NO_]UNMASK/[NO_]IO_32BIT */ - spin_lock_irqsave(&hwgroup->lock, flags); + spin_lock_irqsave(&hwif->lock, flags); port_ops->set_pio_mode(drive, arg); - spin_unlock_irqrestore(&hwgroup->lock, flags); + spin_unlock_irqrestore(&hwif->lock, flags); } else port_ops->set_pio_mode(drive, arg); } else { |
