Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ide: add 'init_default' and 'restore' arguments to ide_unregister() 



* Add 'init_default' (flag for calling init_hwif_default()) and 'restore'
  (flag for calling ide_hwif_restore()) arguments to ide_unregister().

* Update ide_unregister() users to set 'init_default' and 'restore' flags.

* No need to set 'init_default' flag in ide_register_hw() if the setup done
  by init_hwif_default() is going to be overridden by ide_init_port_hw().

* No need to set 'init_default' and 'restore' flags in cleanup_module().

There should be no functionality changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ead741df

drivers/ide/arm/rapide.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void __devexit rapide_remove(struct expansion_card *ec) 


	ecard_set_drvdata(ec, NULL);



	ide_unregister(hwif->index);

	ide_unregister(hwif->index, 1, 1);



	ecard_release_resources(ec);

}

drivers/ide/ide-pnp.c

+4 −3
Original line number Diff line number Diff line
@@ -60,9 +60,10 @@ static int idepnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id 
static void idepnp_remove(struct pnp_dev * dev)

{

	ide_hwif_t *hwif = pnp_get_drvdata(dev);

	if (hwif) {

		ide_unregister(hwif->index);

	} else



	if (hwif)

		ide_unregister(hwif->index, 1, 1);

	else

		printk(KERN_ERR "idepnp: Unable to remove device, please report.\n");

}

drivers/ide/ide.c

+12 −7
Original line number Diff line number Diff line
@@ -499,6 +499,8 @@ void ide_remove_port_from_hwgroup(ide_hwif_t *hwif) 
/**

 *	ide_unregister		-	free an IDE interface

 *	@index: index of interface (will change soon to a pointer)

 *	@init_default: init default hwif flag

 *	@restore: restore hwif flag

 *

 *	Perform the final unregister of an IDE interface. At the moment

 *	we don't refcount interfaces so this will also get split up.
@@ -518,7 +520,7 @@ void ide_remove_port_from_hwgroup(ide_hwif_t *hwif) 
 *	This is raving bonkers.

 */



void ide_unregister(unsigned int index)

void ide_unregister(unsigned int index, int init_default, int restore)

{

	ide_drive_t *drive;

	ide_hwif_t *hwif, *g;
@@ -602,8 +604,11 @@ void ide_unregister(unsigned int index) 


	/* restore hwif data to pristine status */

	ide_init_port_data(hwif, index);



	if (init_default)

		init_hwif_default(hwif, index);



	if (restore)

		ide_hwif_restore(hwif, &tmp_hwif);



abort:
@@ -710,12 +715,12 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *), 
				goto found;

		}

		for (index = 0; index < MAX_HWIFS; index++)

			ide_unregister(index);

			ide_unregister(index, 1, 1);

	} while (retry--);

	return -1;

found:

	if (hwif->present)

		ide_unregister(index);

		ide_unregister(index, 0, 1);

	else if (!hwif->hold)

		ide_init_port_data(hwif, index);
@@ -1058,7 +1063,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device 
	        case HDIO_UNREGISTER_HWIF:

			if (!capable(CAP_SYS_RAWIO)) return -EACCES;

			/* (arg > MAX_HWIFS) checked in function */

			ide_unregister(arg);

			ide_unregister(arg, 1, 1);

			return 0;

		case HDIO_SET_NICE:

			if (!capable(CAP_SYS_ADMIN)) return -EACCES;
@@ -1703,7 +1708,7 @@ void __exit cleanup_module (void) 
	int index;



	for (index = 0; index < MAX_HWIFS; ++index)

		ide_unregister(index);

		ide_unregister(index, 0, 0);



	proc_ide_destroy();

drivers/ide/legacy/ide-cs.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ void ide_release(struct pcmcia_device *link) 
    if (info->ndev) {

	/* FIXME: if this fails we need to queue the cleanup somehow

	   -- need to investigate the required PCMCIA magic */

	ide_unregister(info->hd);

	ide_unregister(info->hd, 1, 1);

    }

    info->ndev = 0;

drivers/ide/legacy/ide_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int __devexit plat_ide_remove(struct platform_device *pdev) 
{

	ide_hwif_t *hwif = pdev->dev.driver_data;



	ide_unregister(hwif->index);

	ide_unregister(hwif->index, 1, 1);



	return 0;

}