aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/arm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/arm')
-rw-r--r--drivers/ide/arm/ide_arm.c7
-rw-r--r--drivers/ide/arm/palm_bk3710.c10
-rw-r--r--drivers/ide/arm/rapide.c8
3 files changed, 7 insertions, 18 deletions
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 9efd7a86db45..176532ffae0e 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -28,7 +28,6 @@
28 28
29static int __init ide_arm_init(void) 29static int __init ide_arm_init(void)
30{ 30{
31 struct ide_host *host;
32 unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206; 31 unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206;
33 hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; 32 hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
34 33
@@ -50,11 +49,7 @@ static int __init ide_arm_init(void)
50 hw.irq = IDE_ARM_IRQ; 49 hw.irq = IDE_ARM_IRQ;
51 hw.chipset = ide_generic; 50 hw.chipset = ide_generic;
52 51
53 host = ide_host_alloc(NULL, hws); 52 return ide_host_add(NULL, hws, NULL);
54 if (host)
55 ide_host_register(host, NULL, hws);
56
57 return 0;
58} 53}
59 54
60module_init(ide_arm_init); 55module_init(ide_arm_init);
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c
index 24389a571c37..65bb4b8fd570 100644
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
@@ -349,7 +349,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
349 struct resource *mem, *irq; 349 struct resource *mem, *irq;
350 struct ide_host *host; 350 struct ide_host *host;
351 unsigned long base, rate; 351 unsigned long base, rate;
352 int i; 352 int i, rc;
353 hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; 353 hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
354 354
355 clk = clk_get(NULL, "IDECLK"); 355 clk = clk_get(NULL, "IDECLK");
@@ -392,16 +392,14 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
392 hw.irq = irq->start; 392 hw.irq = irq->start;
393 hw.chipset = ide_palm3710; 393 hw.chipset = ide_palm3710;
394 394
395 host = ide_host_alloc(&palm_bk3710_port_info, hws); 395 rc = ide_host_add(&palm_bk3710_port_info, hws, NULL);
396 if (host == NULL) 396 if (rc)
397 goto out; 397 goto out;
398 398
399 ide_host_register(host, &palm_bk3710_port_info, hws);
400
401 return 0; 399 return 0;
402out: 400out:
403 printk(KERN_WARNING "Palm Chip BK3710 IDE Register Fail\n"); 401 printk(KERN_WARNING "Palm Chip BK3710 IDE Register Fail\n");
404 return -ENODEV; 402 return rc;
405} 403}
406 404
407/* work with hotplug and coldplug */ 405/* work with hotplug and coldplug */
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 11f3307385de..2bdd8b734afb 100644
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -52,13 +52,9 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
52 hw.chipset = ide_generic; 52 hw.chipset = ide_generic;
53 hw.dev = &ec->dev; 53 hw.dev = &ec->dev;
54 54
55 host = ide_host_alloc(&rapide_port_info, hws); 55 ret = ide_host_add(&rapide_port_info, hws, &host);
56 if (host == NULL) { 56 if (ret)
57 ret = -ENOENT;
58 goto release; 57 goto release;
59 }
60
61 ide_host_register(host, &rapide_port_info, hws);
62 58
63 ecard_set_drvdata(ec, host); 59 ecard_set_drvdata(ec, host);
64 goto out; 60 goto out;