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

ide: sanitize ide_unregister() usage 

* Remove ide_unregister() call from ide_exit()
  (host drivers take care of unregistering hwif-s themselves).

* Remove ide_unregister() call from probe methods of
  bast-ide, palm_bk3710, ide-cs and delkin_cb host drivers
  (ide_find_port() returns only free ide_hwifs[] entries).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-04-27 15:38:31 +02:00
parent 16019c3528
commit bf64b7a9dd
5 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/ide/arm/bast-ide.c
View File

@ -49,11 +49,7 @@ static int __init bastide_register(unsigned int base, unsigned int aux, int irq)
i = hwif->index;
if (hwif->present)
ide_unregister(i);
else
ide_init_port_data(hwif, i);
ide_init_port_data(hwif, i);
ide_init_port_hw(hwif, &hw);
hwif->port_ops = NULL;

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

@ -398,11 +398,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
i = hwif->index;
if (hwif->present)
ide_unregister(i);
else
ide_init_port_data(hwif, i);
ide_init_port_data(hwif, i);
ide_init_port_hw(hwif, &hw);
hwif->mmio = 1;

5
drivers/ide/ide.c
View File

@ -1349,11 +1349,6 @@ int __init init_module (void)
void __exit cleanup_module (void)
{
int index;
for (index = 0; index < MAX_HWIFS; ++index)
ide_unregister(index);
proc_ide_destroy();
class_destroy(ide_port_class);

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

@ -183,11 +183,7 @@ static ide_hwif_t *idecs_register(unsigned long io, unsigned long ctl,
i = hwif->index;
if (hwif->present)
ide_unregister(i);
else
ide_init_port_data(hwif, i);
ide_init_port_data(hwif, i);
ide_init_port_hw(hwif, &hw);
hwif->port_ops = &idecs_port_ops;

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

@ -87,11 +87,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
i = hwif->index;
if (hwif->present)
ide_unregister(i);
else
ide_init_port_data(hwif, i);
ide_init_port_data(hwif, i);
ide_init_port_hw(hwif, &hw);
hwif->port_ops = &delkin_cb_port_ops;