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>

6 files changed, 43 insertions, 29 deletions

diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index 33bb7b87be5d..a940784d5796 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -192,8 +192,13 @@ static int __init initRegisters(void)
         return t;
 }
 
+static const struct ide_port_ops ali14xx_port_ops = {
+        .set_pio_mode           = ali14xx_set_pio_mode,
+};
+
 static const struct ide_port_info ali14xx_port_info = {
         .chipset                = ide_ali14xx,
+        .port_ops               = &ali14xx_port_ops,
         .host_flags             = IDE_HFLAG_NO_DMA | IDE_HFLAG_NO_AUTOTUNE,
         .pio_mask               = ATA_PIO4,
 };
@@ -224,14 +229,12 @@ static int __init ali14xx_probe(void)
         hwif = ide_find_port();
         if (hwif) {
                 ide_init_port_hw(hwif, &hw[0]);
-                hwif->set_pio_mode = &ali14xx_set_pio_mode;
                 idx[0] = hwif->index;
         }
 
         mate = ide_find_port();
         if (mate) {
                 ide_init_port_hw(mate, &hw[1]);
-                mate->set_pio_mode = &ali14xx_set_pio_mode;
                 idx[1] = mate->index;
         }
 
diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index 9c6b3249a004..a14abb2c23ed 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -86,8 +86,13 @@ static void dtc2278_set_pio_mode(ide_drive_t *drive, const u8 pio)
         }
 }
 
+static const struct ide_port_ops dtc2278_port_ops = {
+        .set_pio_mode           = dtc2278_set_pio_mode,
+};
+
 static const struct ide_port_info dtc2278_port_info __initdata = {
         .chipset                = ide_dtc2278,
+        .port_ops               = &dtc2278_port_ops,
         .host_flags             = IDE_HFLAG_SERIALIZE |
                                   IDE_HFLAG_NO_UNMASK_IRQS |
                                   IDE_HFLAG_IO_32BIT |
@@ -134,7 +139,6 @@ static int __init dtc2278_probe(void)
         hwif = ide_find_port();
         if (hwif) {
                 ide_init_port_hw(hwif, &hw[0]);
-                hwif->set_pio_mode = dtc2278_set_pio_mode;
                 idx[0] = hwif->index;
         }
 
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 60f52f5158c9..9d45ed3bffaa 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -328,8 +328,15 @@ int probe_ht6560b = 0;
 module_param_named(probe, probe_ht6560b, bool, 0);
 MODULE_PARM_DESC(probe, "probe for HT6560B chipset");
 
+static const struct ide_port_ops ht6560b_port_ops = {
+        .port_init_devs         = ht6560b_port_init_devs,
+        .set_pio_mode           = ht6560b_set_pio_mode,
+        .selectproc             = ht6560b_selectproc,
+};
+
 static const struct ide_port_info ht6560b_port_info __initdata = {
         .chipset                = ide_ht6560b,
+        .port_ops               = &ht6560b_port_ops,
         .host_flags             = IDE_HFLAG_SERIALIZE | /* is this needed? */
                                   IDE_HFLAG_NO_DMA |
                                   IDE_HFLAG_NO_AUTOTUNE |
@@ -368,18 +375,12 @@ static int __init ht6560b_init(void)
         hwif = ide_find_port();
         if (hwif) {
                 ide_init_port_hw(hwif, &hw[0]);
-                hwif->selectproc     = ht6560b_selectproc;
-                hwif->set_pio_mode   = ht6560b_set_pio_mode;
-                hwif->port_init_devs = ht6560b_port_init_devs;
                 idx[0] = hwif->index;
         }
 
         mate = ide_find_port();
         if (mate) {
                 ide_init_port_hw(mate, &hw[1]);
-                mate->selectproc     = ht6560b_selectproc;
-                mate->set_pio_mode   = ht6560b_set_pio_mode;
-                mate->port_init_devs = ht6560b_port_init_devs;
                 idx[1] = mate->index;
         }
 
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index b97b8d51b3eb..c491850e0f7f 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -143,6 +143,10 @@ static void ide_detach(struct pcmcia_device *link)
     kfree(link->priv);
 } /* ide_detach */
 
+static const struct ide_port_ops idecs_port_ops = {
+        .quirkproc              = ide_undecoded_slave,
+};
+
 static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq, struct pcmcia_device *handle)
 {
     ide_hwif_t *hwif;
@@ -168,7 +172,7 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq
         ide_init_port_data(hwif, i);
 
     ide_init_port_hw(hwif, &hw);
-    hwif->quirkproc = &ide_undecoded_slave;
+    hwif->port_ops = &idecs_port_ops;
 
     idx[0] = i;
 
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index 6e820c7c5c6b..65f098d15154 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -304,6 +304,18 @@ static void __init qd6580_port_init_devs(ide_hwif_t *hwif)
         hwif->drives[1].drive_data = t2;
 }
 
+static const struct ide_port_ops qd6500_port_ops = {
+        .port_init_devs         = qd6500_port_init_devs,
+        .set_pio_mode           = qd6500_set_pio_mode,
+        .selectproc             = qd65xx_select,
+};
+
+static const struct ide_port_ops qd6580_port_ops = {
+        .port_init_devs         = qd6580_port_init_devs,
+        .set_pio_mode           = qd6580_set_pio_mode,
+        .selectproc             = qd65xx_select,
+};
+
 static const struct ide_port_info qd65xx_port_info __initdata = {
         .chipset                = ide_qd65xx,
         .host_flags             = IDE_HFLAG_IO_32BIT |
@@ -361,6 +373,7 @@ static int __init qd_probe(int base)
                 printk(KERN_DEBUG "qd6500: config=%#x, ID3=%u\n",
                         config, QD_ID3);
 
+                d.port_ops = &qd6500_port_ops;
                 d.host_flags |= IDE_HFLAG_SINGLE;
 
                 hwif = ide_find_port_slot(&d);
@@ -371,10 +384,6 @@ static int __init qd_probe(int base)
 
                 hwif->config_data = (base << 8) | config;
 
-                hwif->port_init_devs = qd6500_port_init_devs;
-                hwif->set_pio_mode   = qd6500_set_pio_mode;
-                hwif->selectproc     = qd65xx_select;
-
                 idx[unit] = hwif->index;
 
                 ide_device_add(idx, &d);
@@ -400,6 +409,8 @@ static int __init qd_probe(int base)
 
                 outb(QD_DEF_CONTR, QD_CONTROL_PORT);
 
+                d.port_ops = &qd6580_port_ops;
+
                 if (control & QD_CONTR_SEC_DISABLED) {
                         /* secondary disabled */
 
@@ -415,10 +426,6 @@ static int __init qd_probe(int base)
 
                         hwif->config_data = (base << 8) | config;
 
-                        hwif->port_init_devs = qd6580_port_init_devs;
-                        hwif->set_pio_mode   = qd6580_set_pio_mode;
-                        hwif->selectproc     = qd65xx_select;
-
                         idx[unit] = hwif->index;
 
                         ide_device_add(idx, &d);
@@ -433,24 +440,16 @@ static int __init qd_probe(int base)
                         hwif = ide_find_port();
                         if (hwif) {
                                 ide_init_port_hw(hwif, &hw[0]);
-                                hwif->config_data = (base << 8) | config;
-                                hwif->port_init_devs = qd6580_port_init_devs;
-                                hwif->set_pio_mode   = qd6580_set_pio_mode;
-                                hwif->selectproc     = qd65xx_select;
                                 idx[0] = hwif->index;
                         }
 
                         mate = ide_find_port();
                         if (mate) {
                                 ide_init_port_hw(mate, &hw[1]);
-                                mate->config_data = (base << 8) | config;
-                                mate->port_init_devs = qd6580_port_init_devs;
-                                mate->set_pio_mode   = qd6580_set_pio_mode;
-                                mate->selectproc     = qd65xx_select;
                                 idx[1] = mate->index;
                         }
 
-                        ide_device_add(idx, &qd65xx_port_info);
+                        ide_device_add(idx, &d);
 
                         return 0; /* no other qd65xx possible */
                 }
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index 4d90badd2bda..757156060a6b 100644
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -120,8 +120,13 @@ static void umc_set_pio_mode(ide_drive_t *drive, const u8 pio)
         spin_unlock_irqrestore(&ide_lock, flags);
 }
 
+static const struct ide_port_ops umc8672_port_ops = {
+        .set_pio_mode           = umc_set_pio_mode,
+};
+
 static const struct ide_port_info umc8672_port_info __initdata = {
         .chipset                = ide_umc8672,
+        .port_ops               = &umc8672_port_ops,
         .host_flags             = IDE_HFLAG_NO_DMA | IDE_HFLAG_NO_AUTOTUNE,
         .pio_mask               = ATA_PIO4,
 };
@@ -161,14 +166,12 @@ static int __init umc8672_probe(void)
         hwif = ide_find_port();
         if (hwif) {
                 ide_init_port_hw(hwif, &hw[0]);
-                hwif->set_pio_mode = umc_set_pio_mode;
                 idx[0] = hwif->index;
         }
 
         mate = ide_find_port();
         if (mate) {
                 ide_init_port_hw(mate, &hw[1]);
-                mate->set_pio_mode = umc_set_pio_mode;
                 idx[1] = mate->index;
         }