Skip to content

Commit e26eec9

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

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/scsi/qlogicpti.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,7 @@ static int qpti_sbus_probe(struct platform_device *op)
14091409
return -ENODEV;
14101410
}
14111411

1412-
static int qpti_sbus_remove(struct platform_device *op)
1412+
static void qpti_sbus_remove(struct platform_device *op)
14131413
{
14141414
struct qlogicpti *qpti = dev_get_drvdata(&op->dev);
14151415

@@ -1438,8 +1438,6 @@ static int qpti_sbus_remove(struct platform_device *op)
14381438
of_iounmap(&op->resource[0], qpti->sreg, sizeof(unsigned char));
14391439

14401440
scsi_host_put(qpti->qhost);
1441-
1442-
return 0;
14431441
}
14441442

14451443
static const struct of_device_id qpti_match[] = {
@@ -1465,7 +1463,7 @@ static struct platform_driver qpti_sbus_driver = {
14651463
.of_match_table = qpti_match,
14661464
},
14671465
.probe = qpti_sbus_probe,
1468-
.remove = qpti_sbus_remove,
1466+
.remove_new = qpti_sbus_remove,
14691467
};
14701468
module_platform_driver(qpti_sbus_driver);
14711469

0 commit comments

Comments
 (0)