Skip to content

Commit 6ff482e

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

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/scsi/sun_esp.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ static int esp_sbus_probe(struct platform_device *op)
550550
return ret;
551551
}
552552

553-
static int esp_sbus_remove(struct platform_device *op)
553+
static void esp_sbus_remove(struct platform_device *op)
554554
{
555555
struct esp *esp = dev_get_drvdata(&op->dev);
556556
struct platform_device *dma_of = esp->dma;
@@ -581,8 +581,6 @@ static int esp_sbus_remove(struct platform_device *op)
581581
dev_set_drvdata(&op->dev, NULL);
582582

583583
put_device(&dma_of->dev);
584-
585-
return 0;
586584
}
587585

588586
static const struct of_device_id esp_match[] = {
@@ -605,7 +603,7 @@ static struct platform_driver esp_sbus_driver = {
605603
.of_match_table = esp_match,
606604
},
607605
.probe = esp_sbus_probe,
608-
.remove = esp_sbus_remove,
606+
.remove_new = esp_sbus_remove,
609607
};
610608
module_platform_driver(esp_sbus_driver);
611609

0 commit comments

Comments
 (0)