1 files changed, 11 insertions, 35 deletions

diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 60f52f5158c9..702d8deb5780 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -328,8 +328,16 @@ 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 = {
+        .name                   = DRV_NAME,
         .chipset                = ide_ht6560b,
+        .port_ops               = &ht6560b_port_ops,
         .host_flags             = IDE_HFLAG_SERIALIZE | /* is this needed? */
                                   IDE_HFLAG_NO_DMA |
                                   IDE_HFLAG_NO_AUTOTUNE |
@@ -339,53 +347,21 @@ static const struct ide_port_info ht6560b_port_info __initdata = {
 
 static int __init ht6560b_init(void)
 {
-        ide_hwif_t *hwif, *mate;
-        static u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
-        hw_regs_t hw[2];
-
         if (probe_ht6560b == 0)
                 return -ENODEV;
 
         if (!request_region(HT_CONFIG_PORT, 1, DRV_NAME)) {
                 printk(KERN_NOTICE "%s: HT_CONFIG_PORT not found\n",
-                        __FUNCTION__);
+                        __func__);
                 return -ENODEV;
         }
 
         if (!try_to_init_ht6560b()) {
-                printk(KERN_NOTICE "%s: HBA not found\n", __FUNCTION__);
+                printk(KERN_NOTICE "%s: HBA not found\n", __func__);
                 goto release_region;
         }
 
-        memset(&hw, 0, sizeof(hw));
-
-        ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);
-        hw[0].irq = 14;
-
-        ide_std_init_ports(&hw[1], 0x170, 0x376);
-        hw[1].irq = 15;
-
-        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;
-        }
-
-        ide_device_add(idx, &ht6560b_port_info);
-
-        return 0;
+        return ide_legacy_device_add(&ht6560b_port_info, 0);
 
 release_region:
         release_region(HT_CONFIG_PORT, 1);