diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 13:55:57 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 13:55:57 -0400 |
commit | 48c3c1072651922ed153bcf0a33ea82cf20df390 (patch) | |
tree | 92ad23e3869e70731eca99394c08a3bf06b8753e /drivers/ide/arm/ide_arm.c | |
parent | 374e042c3e767ac2e5a40b78529220e0b3de793c (diff) |
ide: add struct ide_host (take 3)
* Add struct ide_host which keeps pointers to host's ports.
* Add ide_host_alloc[_all]() and ide_host_remove() helpers.
* Pass 'struct ide_host *host' instead of 'u8 *idx' to
ide_device_add[_all]() and rename it to ide_host_register[_all]().
* Convert host drivers and core code to use struct ide_host.
* Remove no longer needed ide_find_port().
* Make ide_find_port_slot() static.
* Unexport ide_unregister().
v2:
* Add missing 'struct ide_host *host' to macide.c.
v3:
* Fix build problem in pmac.c (s/ide_alloc_host/ide_host_alloc/)
(Noticed by Stephen Rothwell).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm/ide_arm.c')
-rw-r--r-- | drivers/ide/arm/ide_arm.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c index e9831bbd988a..9efd7a86db45 100644 --- a/drivers/ide/arm/ide_arm.c +++ b/drivers/ide/arm/ide_arm.c | |||
@@ -28,10 +28,9 @@ | |||
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; | 31 | struct ide_host *host; |
32 | unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206; | 32 | unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206; |
33 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | 33 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; |
34 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | ||
35 | 34 | ||
36 | if (!request_region(base, 8, DRV_NAME)) { | 35 | if (!request_region(base, 8, DRV_NAME)) { |
37 | printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n", | 36 | printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n", |
@@ -51,12 +50,9 @@ static int __init ide_arm_init(void) | |||
51 | hw.irq = IDE_ARM_IRQ; | 50 | hw.irq = IDE_ARM_IRQ; |
52 | hw.chipset = ide_generic; | 51 | hw.chipset = ide_generic; |
53 | 52 | ||
54 | hwif = ide_find_port(); | 53 | host = ide_host_alloc(NULL, hws); |
55 | if (hwif) { | 54 | if (host) |
56 | idx[0] = hwif->index; | 55 | ide_host_register(host, NULL, hws); |
57 | |||
58 | ide_device_add(idx, NULL, hws); | ||
59 | } | ||
60 | 56 | ||
61 | return 0; | 57 | return 0; |
62 | } | 58 | } |