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>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 9f6e33d8a8b2..09526a0de734 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -273,7 +273,7 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)
 
 static void ide_dump_opcode(ide_drive_t *drive)
 {
-        struct request *rq = drive->hwif->hwgroup->rq;
+        struct request *rq = drive->hwif->rq;
         ide_task_t *task = NULL;
 
         if (!rq)
@@ -346,10 +346,13 @@ static void ide_dump_ata_error(ide_drive_t *drive, u8 err)
         printk(KERN_CONT "}");
         if ((err & (ATA_BBK | ATA_ABORTED)) == ATA_BBK ||
             (err & (ATA_UNC | ATA_IDNF | ATA_AMNF))) {
+                struct request *rq = drive->hwif->rq;
+
                 ide_dump_sector(drive);
-                if (HWGROUP(drive) && HWGROUP(drive)->rq)
+
+                if (rq)
                         printk(KERN_CONT ", sector=%llu",
-                               (unsigned long long)HWGROUP(drive)->rq->sector);
+                               (unsigned long long)rq->sector);
         }
         printk(KERN_CONT "\n");
 }