aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/legacy/falconide.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 13:55:57 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 13:55:57 -0400
commit48c3c1072651922ed153bcf0a33ea82cf20df390 (patch)
tree92ad23e3869e70731eca99394c08a3bf06b8753e /drivers/ide/legacy/falconide.c
parent374e042c3e767ac2e5a40b78529220e0b3de793c (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/legacy/falconide.c')
-rw-r--r--drivers/ide/legacy/falconide.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 3e2c6125f031..4eb5c3f9fecc 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -112,7 +112,7 @@ static void __init falconide_setup_ports(hw_regs_t *hw)
112 112
113static int __init falconide_init(void) 113static int __init falconide_init(void)
114{ 114{
115 ide_hwif_t *hwif; 115 struct ide_host *host;
116 hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; 116 hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
117 117
118 if (!MACH_IS_ATARI || !ATARIHW_PRESENT(IDE)) 118 if (!MACH_IS_ATARI || !ATARIHW_PRESENT(IDE))
@@ -127,13 +127,10 @@ static int __init falconide_init(void)
127 127
128 falconide_setup_ports(&hw); 128 falconide_setup_ports(&hw);
129 129
130 hwif = ide_find_port(); 130 host = ide_host_alloc(&falconide_port_info, hws);
131 if (hwif) { 131 if (host) {
132 u8 index = hwif->index;
133 u8 idx[4] = { index, 0xff, 0xff, 0xff };
134
135 ide_get_lock(NULL, NULL); 132 ide_get_lock(NULL, NULL);
136 ide_device_add(idx, &falconide_port_info, hws); 133 ide_host_register(host, &falconide_port_info, hws);
137 ide_release_lock(); 134 ide_release_lock();
138 } 135 }
139 136