Skip to content

Commit 15b016b

Browse files
Uwe Kleine-Königmartinkpetersen
authored andcommitted
scsi: sun3: 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/84239a68fe06143d1d6fed6c9aaae6a4680ead71.1701619134.git.u.kleine-koenig@pengutronix.de Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 357a7fd commit 15b016b

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/scsi/sun3_scsi.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ static int __init sun3_scsi_probe(struct platform_device *pdev)
641641
return error;
642642
}
643643

644-
static int __exit sun3_scsi_remove(struct platform_device *pdev)
644+
static void __exit sun3_scsi_remove(struct platform_device *pdev)
645645
{
646646
struct Scsi_Host *instance = platform_get_drvdata(pdev);
647647
struct NCR5380_hostdata *hostdata = shost_priv(instance);
@@ -654,11 +654,10 @@ static int __exit sun3_scsi_remove(struct platform_device *pdev)
654654
if (udc_regs)
655655
dvma_free(udc_regs);
656656
iounmap(ioaddr);
657-
return 0;
658657
}
659658

660659
static struct platform_driver sun3_scsi_driver = {
661-
.remove = __exit_p(sun3_scsi_remove),
660+
.remove_new = __exit_p(sun3_scsi_remove),
662661
.driver = {
663662
.name = DRV_MODULE_NAME,
664663
},

0 commit comments

Comments
 (0)