diff options
Diffstat (limited to 'drivers/ide/arm/ide_arm.c')
| -rw-r--r-- | drivers/ide/arm/ide_arm.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c index 2f311da4c963..176532ffae0e 100644 --- a/drivers/ide/arm/ide_arm.c +++ b/drivers/ide/arm/ide_arm.c | |||
| @@ -28,10 +28,8 @@ | |||
| 28 | 28 | ||
| 29 | static int __init ide_arm_init(void) | 29 | static int __init ide_arm_init(void) |
| 30 | { | 30 | { |
| 31 | ide_hwif_t *hwif; | ||
| 32 | hw_regs_t hw; | ||
| 33 | unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206; | 31 | unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206; |
| 34 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | 32 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; |
| 35 | 33 | ||
| 36 | if (!request_region(base, 8, DRV_NAME)) { | 34 | if (!request_region(base, 8, DRV_NAME)) { |
| 37 | printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n", | 35 | printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n", |
| @@ -51,15 +49,7 @@ static int __init ide_arm_init(void) | |||
| 51 | hw.irq = IDE_ARM_IRQ; | 49 | hw.irq = IDE_ARM_IRQ; |
| 52 | hw.chipset = ide_generic; | 50 | hw.chipset = ide_generic; |
| 53 | 51 | ||
| 54 | hwif = ide_find_port(); | 52 | return ide_host_add(NULL, hws, NULL); |
| 55 | if (hwif) { | ||
| 56 | ide_init_port_hw(hwif, &hw); | ||
| 57 | idx[0] = hwif->index; | ||
| 58 | |||
| 59 | ide_device_add(idx, NULL); | ||
| 60 | } | ||
| 61 | |||
| 62 | return 0; | ||
| 63 | } | 53 | } |
| 64 | 54 | ||
| 65 | module_init(ide_arm_init); | 55 | module_init(ide_arm_init); |
