Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 17 insertions, 71 deletions

diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 81a5282ce1eb..7812ca0be13b 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -1,27 +1,22 @@
 /*
  * generic/default IDE host driver
  *
- * Copyright (C) 2004, 2008 Bartlomiej Zolnierkiewicz
+ * Copyright (C) 2004, 2008-2009 Bartlomiej Zolnierkiewicz
  * This code was split off from ide.c.  See it for original copyrights.
  *
  * May be copied or modified under the terms of the GNU General Public License.
  */
 
-/*
- * For special cases new interfaces may be added using sysfs, i.e.
- *
- *      echo -n "0x168:0x36e:10" > /sys/class/ide_generic/add
- *
- * will add an interface using I/O ports 0x168-0x16f/0x36e and IRQ 10.
- */
-
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/ide.h>
 #include <linux/pci_ids.h>
 
-/* FIXME: convert m32r to use ide_platform host driver */
+/* FIXME: convert arm and m32r to use ide_platform host driver */
+#ifdef CONFIG_ARM
+#include <asm/irq.h>
+#endif
 #ifdef CONFIG_M32R
 #include <asm/m32r.h>
 #endif
@@ -32,62 +27,15 @@ static int probe_mask;
 module_param(probe_mask, int, 0);
 MODULE_PARM_DESC(probe_mask, "probe mask for legacy ISA IDE ports");
 
-static ssize_t store_add(struct class *cls, const char *buf, size_t n)
-{
-        unsigned int base, ctl;
-        int irq, rc;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
-
-        if (sscanf(buf, "%x:%x:%d", &base, &ctl, &irq) != 3)
-                return -EINVAL;
-
-        memset(&hw, 0, sizeof(hw));
-        ide_std_init_ports(&hw, base, ctl);
-        hw.irq = irq;
-        hw.chipset = ide_generic;
-
-        rc = ide_host_add(NULL, hws, NULL);
-        if (rc)
-                return rc;
-
-        return n;
-};
-
-static struct class_attribute ide_generic_class_attrs[] = {
-        __ATTR(add, S_IWUSR, NULL, store_add),
-        __ATTR_NULL
+static const struct ide_port_info ide_generic_port_info = {
+        .host_flags             = IDE_HFLAG_NO_DMA,
 };
 
-static void ide_generic_class_release(struct class *cls)
-{
-        kfree(cls);
-}
-
-static int __init ide_generic_sysfs_init(void)
-{
-        struct class *cls;
-        int rc;
-
-        cls = kzalloc(sizeof(*cls), GFP_KERNEL);
-        if (!cls)
-                return -ENOMEM;
-
-        cls->name = DRV_NAME;
-        cls->owner = THIS_MODULE;
-        cls->class_release = ide_generic_class_release;
-        cls->class_attrs = ide_generic_class_attrs;
-
-        rc = class_register(cls);
-        if (rc) {
-                kfree(cls);
-                return rc;
-        }
-
-        return 0;
-}
-
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \
-        || defined(CONFIG_PLAT_OPSPUT)
+#ifdef CONFIG_ARM
+static const u16 legacy_bases[] = { 0x1f0 };
+static const int legacy_irqs[]  = { IRQ_HARDDISK };
+#elif defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) || \
+      defined(CONFIG_PLAT_OPSPUT)
 static const u16 legacy_bases[] = { 0x1f0 };
 static const int legacy_irqs[]  = { PLD_IRQ_CFIREQ };
 #elif defined(CONFIG_PLAT_MAPPI3)
@@ -103,11 +51,11 @@ static const int legacy_irqs[]  = { 14, 15, 11, 10, 8, 12 };
 
 static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary)
 {
+#ifdef CONFIG_PCI
         struct pci_dev *p = NULL;
         u16 val;
 
         for_each_pci_dev(p) {
-
                 if (pci_resource_start(p, 0) == 0x1f0)
                         *primary = 1;
                 if (pci_resource_start(p, 2) == 0x170)
@@ -122,7 +70,6 @@ static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary)
                 /* Intel MPIIX - PIO ATA on non PCI side of bridge */
                 if (p->vendor == PCI_VENDOR_ID_INTEL &&
                     p->device == PCI_DEVICE_ID_INTEL_82371MX) {
-
                         pci_read_config_word(p, 0x6C, &val);
                         if (val & 0x8000) {
                                 /* ATA port enabled */
@@ -133,6 +80,7 @@ static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary)
                         }
                 }
         }
+#endif
 }
 
 static int __init ide_generic_init(void)
@@ -164,6 +112,7 @@ static int __init ide_generic_init(void)
                                 printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX "
                                                 "not free.\n",
                                                 DRV_NAME, io_addr, io_addr + 7);
+                                rc = -EBUSY;
                                 continue;
                         }
 
@@ -172,6 +121,7 @@ static int __init ide_generic_init(void)
                                                 "not free.\n",
                                                 DRV_NAME, io_addr + 0x206);
                                 release_region(io_addr, 8);
+                                rc = -EBUSY;
                                 continue;
                         }
 
@@ -184,7 +134,7 @@ static int __init ide_generic_init(void)
 #endif
                         hw.chipset = ide_generic;
 
-                        rc = ide_host_add(NULL, hws, NULL);
+                        rc = ide_host_add(&ide_generic_port_info, hws, NULL);
                         if (rc) {
                                 release_region(io_addr + 0x206, 1);
                                 release_region(io_addr, 8);
@@ -192,10 +142,6 @@ static int __init ide_generic_init(void)
                 }
         }
 
-        if (ide_generic_sysfs_init())
-                printk(KERN_ERR DRV_NAME ": failed to create ide_generic "
-                                         "class\n");
-
         return rc;
 }