Skip to content

Commit 0b64922

Browse files
Uwe Kleine-Königmartinkpetersen
authored andcommitted
scsi: mac_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/9013c84059b8ccd6a5c8305aa35cfdfa314ba74c.1701619134.git.u.kleine-koenig@pengutronix.de Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent c71ef3d commit 0b64922

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/scsi/mac_esp.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ static int esp_mac_probe(struct platform_device *dev)
407407
return err;
408408
}
409409

410-
static int esp_mac_remove(struct platform_device *dev)
410+
static void esp_mac_remove(struct platform_device *dev)
411411
{
412412
struct mac_esp_priv *mep = platform_get_drvdata(dev);
413413
struct esp *esp = mep->esp;
@@ -428,13 +428,11 @@ static int esp_mac_remove(struct platform_device *dev)
428428
kfree(esp->command_block);
429429

430430
scsi_host_put(esp->host);
431-
432-
return 0;
433431
}
434432

435433
static struct platform_driver esp_mac_driver = {
436434
.probe = esp_mac_probe,
437-
.remove = esp_mac_remove,
435+
.remove_new = esp_mac_remove,
438436
.driver = {
439437
.name = DRV_MODULE_NAME,
440438
},

0 commit comments

Comments
 (0)