Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  fix BLK_DEV_HD_ONLY on ARM dependencies
  ide: export ide_doubler
  palm_bk3710: add warm-plug support
  delkin_cb: add missing __init/__exit tags
  delkin_cb: add warm-plug support
  delkin_cb: use struct ide_port_info
  delkin_cb: set proper hwif->gendev.parent value
  ide: fix host drivers missing hwif->chipset initialization
  ide-generic: add missing hwif->chipset setup
  sis5513: add missing pci_enable_device() call
  MAINTAINERS: remove SIS 5513 IDE entry
  ide: remove the ide_etrax100 chipset type

17 files changed, 44 insertions, 24 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index b4f3aefa12b6..1607536ff5fb 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -1028,6 +1028,7 @@ endif
 
 config BLK_DEV_HD_ONLY
         bool "Old hard disk (MFM/RLL/IDE) driver"
+        depends on !ARM || ARCH_RPC || ARCH_SHARK || BROKEN
         help
           There are two drivers for MFM/RLL/IDE hard disks. Most people use
           the newer enhanced driver, but this old one is still around for two
diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c
index 713cef20622e..8e8c28104b45 100644
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -42,6 +42,7 @@ static int __init bastide_register(unsigned int base, unsigned int aux, int irq)
 
         hw.io_ports.ctl_addr = aux + (6 * 0x20);
         hw.irq = irq;
+        hw.chipset = ide_generic;
 
         hwif = ide_find_port();
         if (hwif == NULL)
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 4263ffd4ab20..2f311da4c963 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -49,6 +49,7 @@ static int __init ide_arm_init(void)
         memset(&hw, 0, sizeof(hw));
         ide_std_init_ports(&hw, base, ctl);
         hw.irq = IDE_ARM_IRQ;
+        hw.chipset = ide_generic;
 
         hwif = ide_find_port();
         if (hwif) {
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c
index 96378ebfb31f..d024ac8fad14 100644
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
@@ -409,9 +409,6 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
 
         ide_device_add(idx, &palm_bk3710_port_info);
 
-        if (!hwif->present)
-                goto out;
-
         return 0;
 out:
         printk(KERN_WARNING "Palm Chip BK3710 IDE Register Fail\n");
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index a6073e248f45..9134488ac043 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -125,6 +125,7 @@ static int __init ide_generic_init(void)
                         memset(&hw, 0, sizeof(hw));
                         ide_std_init_ports(&hw, io_addr, io_addr + 0x206);
                         hw.irq = ide_default_irq(io_addr);
+                        hw.chipset = ide_generic;
                         ide_init_port_hw(hwif, &hw);
 
                         idx[i] = i;
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index 6a8953f68e9f..adbd01784162 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -55,6 +55,7 @@ static int idepnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
         memset(&hw, 0, sizeof(hw));
         ide_std_init_ports(&hw, base, ctl);
         hw.irq = pnp_irq(dev, 0);
+        hw.chipset = ide_generic;
 
         hwif = ide_find_port();
         if (hwif) {
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 655ec7ef568a..380fa0c8cc84 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1333,8 +1333,7 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
 static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
                           const struct ide_port_info *d)
 {
-        if (d->chipset != ide_etrax100)
-                hwif->channel = port;
+        hwif->channel = port;
 
         if (d->chipset)
                 hwif->chipset = d->chipset;
@@ -1519,7 +1518,7 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d)
                         continue;
                 }
 
-                if (d->chipset != ide_etrax100 && (i & 1) && mate) {
+                if ((i & 1) && mate) {
                         hwif->mate = mate;
                         mate->mate = hwif;
                 }
@@ -1665,6 +1664,7 @@ static void ide_legacy_init_one(u8 *idx, hw_regs_t *hw, u8 port_no,
 
         ide_std_init_ports(hw, base, ctl);
         hw->irq = irq;
+        hw->chipset = d->chipset;
 
         hwif = ide_find_port_slot(d);
         if (hwif) {
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index 8d6ad812a014..55ec7f798772 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -63,7 +63,6 @@ static int proc_ide_read_imodel
         case ide_pmac:          name = "mac-io";        break;
         case ide_au1xxx:        name = "au1xxx";        break;
         case ide_palm3710:      name = "palm3710";      break;
-        case ide_etrax100:      name = "etrax100";      break;
         case ide_acorn:         name = "acorn";         break;
         default:                name = "(unknown)";     break;
         }
diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index 5c730e4dd735..9a1d27ef3f8a 100644
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -138,6 +138,8 @@ static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base,
 
         hw->irq = IRQ_AMIGA_PORTS;
         hw->ack_intr = ack_intr;
+
+        hw->chipset = ide_generic;
 }
 
     /*
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 9e449a0c623f..af11028b4794 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -81,6 +81,8 @@ static void __init falconide_setup_ports(hw_regs_t *hw)
 
         hw->irq = IRQ_MFP_IDE;
         hw->ack_intr = NULL;
+
+        hw->chipset = ide_generic;
 }
 
     /*
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index a9c2593a898c..fed7d812761c 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -16,6 +16,7 @@
 #include <linux/ide.h>
 #include <linux/init.h>
 #include <linux/zorro.h>
+#include <linux/module.h>
 
 #include <asm/setup.h>
 #include <asm/amigahw.h>
@@ -62,7 +63,10 @@
                                                GAYLE_NUM_HWIFS-1)
 #define GAYLE_HAS_CONTROL_REG   (!ide_doubler)
 #define GAYLE_IDEREG_SIZE       (ide_doubler ? 0x1000 : 0x2000)
+
 int ide_doubler = 0;    /* support IDE doublers? */
+EXPORT_SYMBOL_GPL(ide_doubler);
+
 module_param_named(doubler, ide_doubler, bool, 0);
 MODULE_PARM_DESC(doubler, "enable support for IDE doublers");
 #endif /* CONFIG_BLK_DEV_IDEDOUBLER */
@@ -112,6 +116,8 @@ static void __init gayle_setup_ports(hw_regs_t *hw, unsigned long base,
 
         hw->irq = IRQ_AMIGA_PORTS;
         hw->ack_intr = ack_intr;
+
+        hw->chipset = ide_generic;
 }
 
     /*
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index caa2632dd08e..2e84290d0bcc 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -78,6 +78,8 @@ static void __init macide_setup_ports(hw_regs_t *hw, unsigned long base,
 
         hw->irq = irq;
         hw->ack_intr = ack_intr;
+
+        hw->chipset = ide_generic;
 }
 
 static const char *mac_ide_name[] =
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 6f535d00e638..8ff6e2d20834 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -70,6 +70,8 @@ static void q40_ide_setup_ports(hw_regs_t *hw, unsigned long base,
 
         hw->irq = irq;
         hw->ack_intr = ack_intr;
+
+        hw->chipset = ide_generic;
 }
 
 static void q40ide_input_data(ide_drive_t *drive, struct request *rq,
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index aaf38109eaec..b38a1980dcd5 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -747,9 +747,11 @@ static int __init cmd640x_init(void)
 
         ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);
         hw[0].irq = 14;
+        hw[0].chipset = ide_cmd640;
 
         ide_std_init_ports(&hw[1], 0x170, 0x376);
         hw[1].irq = 15;
+        hw[1].chipset = ide_cmd640;
 
         printk(KERN_INFO "cmd640: buggy cmd640%c interface on %s, config=0x%02x"
                          "\n", 'a' + cmd640_chip_version - 1, bus_type, cfr);
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index b9e457996d0e..af0f30051d5a 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -47,13 +47,18 @@ static const struct ide_port_ops delkin_cb_port_ops = {
         .quirkproc              = ide_undecoded_slave,
 };
 
+static const struct ide_port_info delkin_cb_port_info = {
+        .port_ops               = &delkin_cb_port_ops,
+        .host_flags             = IDE_HFLAG_IO_32BIT | IDE_HFLAG_UNMASK_IRQS |
+                                  IDE_HFLAG_NO_DMA,
+};
+
 static int __devinit
 delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
 {
         unsigned long base;
         hw_regs_t hw;
         ide_hwif_t *hwif = NULL;
-        ide_drive_t *drive;
         int i, rc;
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
@@ -79,6 +84,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
         memset(&hw, 0, sizeof(hw));
         ide_std_init_ports(&hw, base + 0x10, base + 0x1e);
         hw.irq = dev->irq;
+        hw.dev = &dev->dev;
         hw.chipset = ide_pci;           /* this enables IRQ sharing */
 
         hwif = ide_find_port();
@@ -89,26 +95,16 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
 
         ide_init_port_data(hwif, i);
         ide_init_port_hw(hwif, &hw);
-        hwif->port_ops = &delkin_cb_port_ops;
 
         idx[0] = i;
 
-        ide_device_add(idx, NULL);
-
-        if (!hwif->present)
-                goto out_disable;
+        ide_device_add(idx, &delkin_cb_port_info);
 
         pci_set_drvdata(dev, hwif);
-        hwif->dev = &dev->dev;
-        drive = &hwif->drives[0];
-        if (drive->present) {
-                drive->io_32bit = 1;
-                drive->unmask   = 1;
-        }
+
         return 0;
 
 out_disable:
-        printk(KERN_ERR "delkin_cb: no IDE devices found\n");
         pci_release_regions(dev);
         pci_disable_device(dev);
         return -ENODEV;
@@ -139,14 +135,12 @@ static struct pci_driver driver = {
         .remove         = delkin_cb_remove,
 };
 
-static int
-delkin_cb_init (void)
+static int __init delkin_cb_init(void)
 {
         return pci_register_driver(&driver);
 }
 
-static void
-delkin_cb_exit (void)
+static void __exit delkin_cb_exit(void)
 {
         pci_unregister_driver(&driver);
 }
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 4b0b85d8faf5..e127eb25ab63 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -569,6 +569,11 @@ static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_devi
 {
         struct ide_port_info d = sis5513_chipset;
         u8 udma_rates[] = { 0x00, 0x00, 0x07, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f };
+        int rc;
+
+        rc = pci_enable_device(dev);
+        if (rc)
+                return rc;
 
         if (sis_find_family(dev) == 0)
                 return -ENOTSUPP;
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index f0e638dcc3ab..236f9c38e519 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -303,6 +303,8 @@ static int __init m8xx_ide_init_ports(hw_regs_t *hw, unsigned long data_port)
         pcmp->pcmc_per = 0x100000 >> (16 * _slot_);
 #endif  /* CONFIG_IDE_8xx_PCCARD */
 
+        hw->chipset = ide_generic;
+
         return 0;
 }
 #endif /* CONFIG_IDE_8xx_PCCARD || CONFIG_IDE_8xx_DIRECT */
@@ -377,6 +379,8 @@ static int __init m8xx_ide_init_ports(hw_regs_t *hw, unsigned long data_port)
         ((immap_t *) IMAP_ADDR)->im_siu_conf.sc_siel |=
                         (0x80000000 >> ioport_dsc[data_port].irq);
 
+        hw->chipset = ide_generic;
+
         return 0;
 }
 #endif  /* CONFIG_IDE_8xx_DIRECT */