Skip to content

Commit f0baf76

Browse files
Uwe Kleine-Königmartinkpetersen
authored andcommitted
scsi: mvme16x: 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/1d16e93a498831abd64df8b8cf54fd8872cdd1cd.1701619134.git.u.kleine-koenig@pengutronix.de Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 69b43bf commit f0baf76

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/scsi/mvme16x_scsi.c

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

106-
static int mvme16x_device_remove(struct platform_device *dev)
106+
static void mvme16x_device_remove(struct platform_device *dev)
107107
{
108108
struct Scsi_Host *host = platform_get_drvdata(dev);
109109
struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
@@ -120,16 +120,14 @@ static int mvme16x_device_remove(struct platform_device *dev)
120120
NCR_700_release(host);
121121
kfree(hostdata);
122122
free_irq(host->irq, host);
123-
124-
return 0;
125123
}
126124

127125
static struct platform_driver mvme16x_scsi_driver = {
128126
.driver = {
129127
.name = "mvme16x-scsi",
130128
},
131129
.probe = mvme16x_probe,
132-
.remove = mvme16x_device_remove,
130+
.remove_new = mvme16x_device_remove,
133131
};
134132

135133
static int __init mvme16x_scsi_init(void)

0 commit comments

Comments
 (0)