Skip to content

Commit 357a7fd

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

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/scsi/sni_53c710.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ static int snirm710_probe(struct platform_device *dev)
104104
return -ENODEV;
105105
}
106106

107-
static int snirm710_driver_remove(struct platform_device *dev)
107+
static void snirm710_driver_remove(struct platform_device *dev)
108108
{
109109
struct Scsi_Host *host = dev_get_drvdata(&dev->dev);
110110
struct NCR_700_Host_Parameters *hostdata =
@@ -115,13 +115,11 @@ static int snirm710_driver_remove(struct platform_device *dev)
115115
free_irq(host->irq, host);
116116
iounmap(hostdata->base);
117117
kfree(hostdata);
118-
119-
return 0;
120118
}
121119

122120
static struct platform_driver snirm710_driver = {
123121
.probe = snirm710_probe,
124-
.remove = snirm710_driver_remove,
122+
.remove_new = snirm710_driver_remove,
125123
.driver = {
126124
.name = "snirm_53c710",
127125
},

0 commit comments

Comments
 (0)