OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: fix hwif-s initialization 

* Add ide_hwifs[] entry initialization to ide_find_port_slot()
  and remove ide_init_port_data() calls from host drivers.

* Unexport ide_init_port_data().

* Remove no longer needed init_ide_data().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-07-16 20:33:39 +02:00
parent 9ad5409375
commit 256c5f8eef
12 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/ide/arm/palm_bk3710.c
View File

@ -400,7 +400,6 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
i = hwif->index; i = hwif->index;
ide_init_port_data(hwif, i);
ide_init_port_hw(hwif, &hw); ide_init_port_hw(hwif, &hw);
default_hwif_mmiops(hwif); default_hwif_mmiops(hwif);

1
drivers/ide/h8300/ide-h8300.c
View File

@ -199,7 +199,6 @@ static int __init h8300_ide_init(void)
} }
index = hwif->index; index = hwif->index;
ide_init_port_data(hwif, index);
ide_init_port_hw(hwif, &hw); ide_init_port_hw(hwif, &hw);
hwif_setup(hwif); hwif_setup(hwif);
hwif->host_flags = IDE_HFLAG_NO_IO_32BIT; hwif->host_flags = IDE_HFLAG_NO_IO_32BIT;

1
drivers/ide/ide-pnp.c
View File

@ -62,7 +62,6 @@ static int idepnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
u8 index = hwif->index; u8 index = hwif->index;
u8 idx[4] = { index, 0xff, 0xff, 0xff }; u8 idx[4] = { index, 0xff, 0xff, 0xff };
ide_init_port_data(hwif, index);
ide_init_port_hw(hwif, &hw); ide_init_port_hw(hwif, &hw);
printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index); printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index);

10
drivers/ide/ide-probe.c
View File

@ -1473,22 +1473,26 @@ ide_hwif_t *ide_find_port_slot(const struct ide_port_info *d)
for (; i < MAX_HWIFS; i++) { for (; i < MAX_HWIFS; i++) {
hwif = &ide_hwifs[i]; hwif = &ide_hwifs[i];
if (hwif->chipset == ide_unknown) if (hwif->chipset == ide_unknown)
return hwif; goto out_found;
} }
} else { } else {
for (i = 2; i < MAX_HWIFS; i++) { for (i = 2; i < MAX_HWIFS; i++) {
hwif = &ide_hwifs[i]; hwif = &ide_hwifs[i];
if (hwif->chipset == ide_unknown) if (hwif->chipset == ide_unknown)
return hwif; goto out_found;
} }
for (i = 0; i < 2 && i < MAX_HWIFS; i++) { for (i = 0; i < 2 && i < MAX_HWIFS; i++) {
hwif = &ide_hwifs[i]; hwif = &ide_hwifs[i];
if (hwif->chipset == ide_unknown) if (hwif->chipset == ide_unknown)
return hwif; goto out_found;
} }
} }
return NULL; return NULL;
out_found:
ide_init_port_data(hwif, i);
return hwif;
} }
EXPORT_SYMBOL_GPL(ide_find_port_slot); EXPORT_SYMBOL_GPL(ide_find_port_slot);

15
drivers/ide/ide.c
View File

@ -121,7 +121,6 @@ void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)
ide_port_init_devices_data(hwif); ide_port_init_devices_data(hwif);
} }
EXPORT_SYMBOL_GPL(ide_init_port_data);
static void ide_port_init_devices_data(ide_hwif_t *hwif) static void ide_port_init_devices_data(ide_hwif_t *hwif)
{ {
@ -150,18 +149,6 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif)
} }
} }
static void __init init_ide_data (void)
{
unsigned int index;
/* Initialise all interface structures */
for (index = 0; index < MAX_HWIFS; ++index) {
ide_hwif_t *hwif = &ide_hwifs[index];
ide_init_port_data(hwif, index);
}
}
void ide_remove_port_from_hwgroup(ide_hwif_t *hwif) void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)
{ {
ide_hwgroup_t *hwgroup = hwif->hwgroup; ide_hwgroup_t *hwgroup = hwif->hwgroup;
@ -1021,8 +1008,6 @@ static int __init ide_init(void)
goto out_port_class; goto out_port_class;
} }
init_ide_data();
proc_ide_create(); proc_ide_create();
return 0; return 0;

1
drivers/ide/legacy/buddha.c
View File

@ -227,7 +227,6 @@ fail_base2:
if (hwif) { if (hwif) {
u8 index = hwif->index; u8 index = hwif->index;
ide_init_port_data(hwif, index);
ide_init_port_hw(hwif, &hw); ide_init_port_hw(hwif, &hw);
idx[i] = index; idx[i] = index;

1
drivers/ide/legacy/falconide.c
View File

@ -111,7 +111,6 @@ static int __init falconide_init(void)
u8 index = hwif->index; u8 index = hwif->index;
u8 idx[4] = { index, 0xff, 0xff, 0xff }; u8 idx[4] = { index, 0xff, 0xff, 0xff };
ide_init_port_data(hwif, index);
ide_init_port_hw(hwif, &hw); ide_init_port_hw(hwif, &hw);
/* Atari has a byte-swapped IDE interface */ /* Atari has a byte-swapped IDE interface */

1
drivers/ide/legacy/gayle.c
View File

@ -185,7 +185,6 @@ found:
if (hwif) { if (hwif) {
u8 index = hwif->index; u8 index = hwif->index;
ide_init_port_data(hwif, index);
ide_init_port_hw(hwif, &hw); ide_init_port_hw(hwif, &hw);
idx[i] = index; idx[i] = index;

1
drivers/ide/legacy/ide-cs.c
View File

@ -187,7 +187,6 @@ static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
i = hwif->index; i = hwif->index;
ide_init_port_data(hwif, i);
ide_init_port_hw(hwif, &hw); ide_init_port_hw(hwif, &hw);
hwif->port_ops = &idecs_port_ops; hwif->port_ops = &idecs_port_ops;

1
drivers/ide/legacy/macide.c
View File

@ -130,7 +130,6 @@ static int __init macide_init(void)
u8 index = hwif->index; u8 index = hwif->index;
u8 idx[4] = { index, 0xff, 0xff, 0xff }; u8 idx[4] = { index, 0xff, 0xff, 0xff };
ide_init_port_data(hwif, index);
ide_init_port_hw(hwif, &hw); ide_init_port_hw(hwif, &hw);
ide_device_add(idx, NULL); ide_device_add(idx, NULL);

1
drivers/ide/legacy/q40ide.c
View File

@ -142,7 +142,6 @@ static int __init q40ide_init(void)
hwif = ide_find_port(); hwif = ide_find_port();
if (hwif) { if (hwif) {
ide_init_port_data(hwif, hwif->index);
ide_init_port_hw(hwif, &hw); ide_init_port_hw(hwif, &hw);
/* Q40 has a byte-swapped IDE interface */ /* Q40 has a byte-swapped IDE interface */

1
drivers/ide/pci/delkin_cb.c
View File

@ -93,7 +93,6 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
i = hwif->index; i = hwif->index;
ide_init_port_data(hwif, i);
ide_init_port_hw(hwif, &hw); ide_init_port_hw(hwif, &hw);
idx[0] = i; idx[0] = i;