ide: add struct ide_port_ops (take 2)

* Move hooks for port/host specific methods from ide_hwif_t to
  'struct ide_port_ops'.

* Add 'const struct ide_port_ops *port_ops' to 'struct ide_port_info'
  and ide_hwif_t.

* Update host drivers and core code accordingly.

While at it:

* Rename ata66_*() cable detect functions to *_cable_detect() to match
  the standard naming. (Suggested by Sergei Shtylyov)

v2:
* Fix build for bast-ide. (Noticed by Andrew Morton)

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 18 insertions, 10 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 45944219eea0..bfec5d066b25 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -159,17 +159,20 @@ EXPORT_SYMBOL(default_hwif_mmiops);
 void SELECT_DRIVE (ide_drive_t *drive)
 {
         ide_hwif_t *hwif = drive->hwif;
+        const struct ide_port_ops *port_ops = hwif->port_ops;
 
-        if (hwif->selectproc)
-                hwif->selectproc(drive);
+        if (port_ops && port_ops->selectproc)
+                port_ops->selectproc(drive);
 
         hwif->OUTB(drive->select.all, hwif->io_ports[IDE_SELECT_OFFSET]);
 }
 
 void SELECT_MASK (ide_drive_t *drive, int mask)
 {
-        if (HWIF(drive)->maskproc)
-                HWIF(drive)->maskproc(drive, mask);
+        const struct ide_port_ops *port_ops = drive->hwif->port_ops;
+
+        if (port_ops && port_ops->maskproc)
+                port_ops->maskproc(drive, mask);
 }
 
 /*
@@ -905,10 +908,11 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)
 {
         ide_hwgroup_t *hwgroup  = HWGROUP(drive);
         ide_hwif_t *hwif        = HWIF(drive);
+        const struct ide_port_ops *port_ops = hwif->port_ops;
         u8 tmp;
 
-        if (hwif->reset_poll != NULL) {
-                if (hwif->reset_poll(drive)) {
+        if (port_ops && port_ops->reset_poll) {
+                if (port_ops->reset_poll(drive)) {
                         printk(KERN_ERR "%s: host reset_poll failure for %s.\n",
                                 hwif->name, drive->name);
                         return ide_stopped;
@@ -974,6 +978,8 @@ static void ide_disk_pre_reset(ide_drive_t *drive)
 
 static void pre_reset(ide_drive_t *drive)
 {
+        const struct ide_port_ops *port_ops = drive->hwif->port_ops;
+
         if (drive->media == ide_disk)
                 ide_disk_pre_reset(drive);
         else
@@ -994,8 +1000,8 @@ static void pre_reset(ide_drive_t *drive)
                 return;
         }
 
-        if (HWIF(drive)->pre_reset != NULL)
-                HWIF(drive)->pre_reset(drive);
+        if (port_ops && port_ops->pre_reset)
+                port_ops->pre_reset(drive);
 
         if (drive->current_speed != 0xff)
                 drive->desired_speed = drive->current_speed;
@@ -1023,6 +1029,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
         unsigned long flags;
         ide_hwif_t *hwif;
         ide_hwgroup_t *hwgroup;
+        const struct ide_port_ops *port_ops;
         u8 ctl;
 
         spin_lock_irqsave(&ide_lock, flags);
@@ -1089,8 +1096,9 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
          * state when the disks are reset this way. At least, the Winbond
          * 553 documentation says that
          */
-        if (hwif->resetproc)
-                hwif->resetproc(drive);
+        port_ops = hwif->port_ops;
+        if (port_ops && port_ops->resetproc)
+                port_ops->resetproc(drive);
 
         spin_unlock_irqrestore(&ide_lock, flags);
         return ide_started;