Skip to content

Commit 51a41ec

Browse files
Uwe Kleine-Königmartinkpetersen
authored andcommitted
scsi: bvme6000: 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/63294479a4e745210c078859afa88904fa0b3be8.1701619134.git.u.kleine-koenig@pengutronix.de Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 3becb4c commit 51a41ec

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/scsi/bvme6000_scsi.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ bvme6000_probe(struct platform_device *dev)
8989
return -ENODEV;
9090
}
9191

92-
static int
92+
static void
9393
bvme6000_device_remove(struct platform_device *dev)
9494
{
9595
struct Scsi_Host *host = platform_get_drvdata(dev);
@@ -99,16 +99,14 @@ bvme6000_device_remove(struct platform_device *dev)
9999
NCR_700_release(host);
100100
kfree(hostdata);
101101
free_irq(host->irq, host);
102-
103-
return 0;
104102
}
105103

106104
static struct platform_driver bvme6000_scsi_driver = {
107105
.driver = {
108106
.name = "bvme6000-scsi",
109107
},
110108
.probe = bvme6000_probe,
111-
.remove = bvme6000_device_remove,
109+
.remove_new = bvme6000_device_remove,
112110
};
113111

114112
static int __init bvme6000_scsi_init(void)

0 commit comments

Comments
 (0)