diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 13:56:39 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 13:56:39 -0500 |
commit | f82c2b171905b6d5af92395d8159546351ab602f (patch) | |
tree | 89790c732a73c3210b5f8578d3a94a2717ab7b3b /drivers/ide/legacy | |
parent | ead741df385607ab74876afdb05fd8ac27da9906 (diff) |
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: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/legacy')
-rw-r--r-- | drivers/ide/legacy/ide-cs.c | 2 | ||||
-rw-r--r-- | drivers/ide/legacy/ide_platform.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index 3bd29676ef6..2d772e2bebb 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
@@ -337,7 +337,7 @@ void ide_release(struct pcmcia_device *link) | |||
337 | if (info->ndev) { | 337 | if (info->ndev) { |
338 | /* FIXME: if this fails we need to queue the cleanup somehow | 338 | /* FIXME: if this fails we need to queue the cleanup somehow |
339 | -- need to investigate the required PCMCIA magic */ | 339 | -- need to investigate the required PCMCIA magic */ |
340 | ide_unregister(info->hd); | 340 | ide_unregister(info->hd, 1, 1); |
341 | } | 341 | } |
342 | info->ndev = 0; | 342 | info->ndev = 0; |
343 | 343 | ||
diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c index 7c7f42a1fff..c0dd67f4af3 100644 --- a/drivers/ide/legacy/ide_platform.c +++ b/drivers/ide/legacy/ide_platform.c | |||
@@ -122,7 +122,7 @@ static int __devexit plat_ide_remove(struct platform_device *pdev) | |||
122 | { | 122 | { |
123 | ide_hwif_t *hwif = pdev->dev.driver_data; | 123 | ide_hwif_t *hwif = pdev->dev.driver_data; |
124 | 124 | ||
125 | ide_unregister(hwif->index); | 125 | ide_unregister(hwif->index, 1, 1); |
126 | 126 | ||
127 | return 0; | 127 | return 0; |
128 | } | 128 | } |