Skip to content

Commit 69b43bf

Browse files
Uwe Kleine-Königmartinkpetersen
authored andcommitted
scsi: mac: Convert to platform remove callback returning void
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is ignored (apart from emitting a warning) and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new(), which already returns void. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). In the error path emit an error message replacing the (less useful) message by the core. Apart from the improved error message there is no change in behaviour. Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/89ce161dad52d99df07135531512ccecb7f25d14.1701619134.git.u.kleine-koenig@pengutronix.de Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 0b64922 commit 69b43bf

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/scsi/mac_scsi.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ static int __init mac_scsi_probe(struct platform_device *pdev)
523523
return error;
524524
}
525525

526-
static int __exit mac_scsi_remove(struct platform_device *pdev)
526+
static void __exit mac_scsi_remove(struct platform_device *pdev)
527527
{
528528
struct Scsi_Host *instance = platform_get_drvdata(pdev);
529529

@@ -532,11 +532,10 @@ static int __exit mac_scsi_remove(struct platform_device *pdev)
532532
free_irq(instance->irq, instance);
533533
NCR5380_exit(instance);
534534
scsi_host_put(instance);
535-
return 0;
536535
}
537536

538537
static struct platform_driver mac_scsi_driver = {
539-
.remove = __exit_p(mac_scsi_remove),
538+
.remove_new = __exit_p(mac_scsi_remove),
540539
.driver = {
541540
.name = DRV_MODULE_NAME,
542541
},

0 commit comments

Comments
 (0)