Skip to content

Commit e84bd0b

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

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/scsi/sun3x_esp.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ static int esp_sun3x_probe(struct platform_device *dev)
243243
return err;
244244
}
245245

246-
static int esp_sun3x_remove(struct platform_device *dev)
246+
static void esp_sun3x_remove(struct platform_device *dev)
247247
{
248248
struct esp *esp = dev_get_drvdata(&dev->dev);
249249
unsigned int irq = esp->host->irq;
@@ -261,13 +261,11 @@ static int esp_sun3x_remove(struct platform_device *dev)
261261
esp->command_block_dma);
262262

263263
scsi_host_put(esp->host);
264-
265-
return 0;
266264
}
267265

268266
static struct platform_driver esp_sun3x_driver = {
269267
.probe = esp_sun3x_probe,
270-
.remove = esp_sun3x_remove,
268+
.remove_new = esp_sun3x_remove,
271269
.driver = {
272270
.name = "sun3x_esp",
273271
},

0 commit comments

Comments
 (0)