Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[linux-2.6] / drivers / ide / arm / ide_arm.c

diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index a3d6744e870a18870e7b98a23129e76b78cce34c..43a70e91363e0b2eed2cdde591a4ffb345c388f3 100644 (file)
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -1,5 +1,5 @@
 /*
- * ARM/ARM26 default IDE host driver
+ * ARM default IDE host driver
  *
  * Copyright (C) 2004 Bartlomiej Zolnierkiewicz
  * Based on code by: Russell King, Ian Molton and Alexander Schulz.
@@ -14,12 +14,6 @@
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 
-#ifdef CONFIG_ARM26
-# define IDE_ARM_HOST  (machine_is_a5k())
-#else
-# define IDE_ARM_HOST  (1)
-#endif
-
 #ifdef CONFIG_ARCH_CLPS7500
 # include <asm/arch/hardware.h>
 #
@@ -30,14 +24,25 @@
 # define IDE_ARM_IRQ   IRQ_HARDDISK
 #endif
 
-void __init ide_arm_init(void)
+static int __init ide_arm_init(void)
 {
-       if (IDE_ARM_HOST) {
-               hw_regs_t hw;
+       ide_hwif_t *hwif;
+       hw_regs_t hw;
+       u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+
+       memset(&hw, 0, sizeof(hw));
+       ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);
+       hw.irq = IDE_ARM_IRQ;
 
-               memset(&hw, 0, sizeof(hw));
-               ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);
-               hw.irq = IDE_ARM_IRQ;
-               ide_register_hw(&hw, 1, NULL);
+       hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
+       if (hwif) {
+               ide_init_port_hw(hwif, &hw);
+               idx[0] = hwif->index;
+
+               ide_device_add(idx, NULL);
        }
+
+       return 0;
 }
+
+module_init(ide_arm_init);