Commit bf64b7a9 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 16019c35

drivers/ide/arm/bast-ide.c

+1 −5
Original line number Diff line number Diff line
@@ -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_hw(hwif, &hw);

	hwif->port_ops = NULL;

drivers/ide/arm/palm_bk3710.c

+1 −5
Original line number Diff line number Diff line
@@ -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_hw(hwif, &hw);



	hwif->mmio = 1;

drivers/ide/ide.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

drivers/ide/legacy/ide-cs.c

+1 −5
Original line number Diff line number Diff line
@@ -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_hw(hwif, &hw);

    hwif->port_ops = &idecs_port_ops;

drivers/ide/pci/delkin_cb.c

+1 −5
Original line number Diff line number Diff line
@@ -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_hw(hwif, &hw);

	hwif->port_ops = &delkin_cb_port_ops;

CRA Git | Maintained and supported by SUSTech CRA and CCSE