Skip to content

Commit 0af9e89

Browse files
Uwe Kleine-Königshenki
authored andcommitted
soc/aspeed: 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(). 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> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> Link: https://lore.kernel.org/r/20230925095532.1984344-2-u.kleine-koenig@pengutronix.de Link: https://lore.kernel.org/r/20230925095532.1984344-3-u.kleine-koenig@pengutronix.de Link: https://lore.kernel.org/r/20230925095532.1984344-4-u.kleine-koenig@pengutronix.de Link: https://lore.kernel.org/r/20230925095532.1984344-5-u.kleine-koenig@pengutronix.de Signed-off-by: Joel Stanley <joel@jms.id.au>
1 parent 0bb80ec commit 0af9e89

4 files changed

Lines changed: 8 additions & 16 deletions

File tree

drivers/soc/aspeed/aspeed-lpc-ctrl.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,14 +332,12 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev)
332332
return rc;
333333
}
334334

335-
static int aspeed_lpc_ctrl_remove(struct platform_device *pdev)
335+
static void aspeed_lpc_ctrl_remove(struct platform_device *pdev)
336336
{
337337
struct aspeed_lpc_ctrl *lpc_ctrl = dev_get_drvdata(&pdev->dev);
338338

339339
misc_deregister(&lpc_ctrl->miscdev);
340340
clk_disable_unprepare(lpc_ctrl->clk);
341-
342-
return 0;
343341
}
344342

345343
static const struct of_device_id aspeed_lpc_ctrl_match[] = {
@@ -355,7 +353,7 @@ static struct platform_driver aspeed_lpc_ctrl_driver = {
355353
.of_match_table = aspeed_lpc_ctrl_match,
356354
},
357355
.probe = aspeed_lpc_ctrl_probe,
358-
.remove = aspeed_lpc_ctrl_remove,
356+
.remove_new = aspeed_lpc_ctrl_remove,
359357
};
360358

361359
module_platform_driver(aspeed_lpc_ctrl_driver);

drivers/soc/aspeed/aspeed-lpc-snoop.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ static int aspeed_lpc_snoop_probe(struct platform_device *pdev)
331331
return rc;
332332
}
333333

334-
static int aspeed_lpc_snoop_remove(struct platform_device *pdev)
334+
static void aspeed_lpc_snoop_remove(struct platform_device *pdev)
335335
{
336336
struct aspeed_lpc_snoop *lpc_snoop = dev_get_drvdata(&pdev->dev);
337337

@@ -340,8 +340,6 @@ static int aspeed_lpc_snoop_remove(struct platform_device *pdev)
340340
aspeed_lpc_disable_snoop(lpc_snoop, 1);
341341

342342
clk_disable_unprepare(lpc_snoop->clk);
343-
344-
return 0;
345343
}
346344

347345
static const struct aspeed_lpc_snoop_model_data ast2400_model_data = {
@@ -368,7 +366,7 @@ static struct platform_driver aspeed_lpc_snoop_driver = {
368366
.of_match_table = aspeed_lpc_snoop_match,
369367
},
370368
.probe = aspeed_lpc_snoop_probe,
371-
.remove = aspeed_lpc_snoop_remove,
369+
.remove_new = aspeed_lpc_snoop_remove,
372370
};
373371

374372
module_platform_driver(aspeed_lpc_snoop_driver);

drivers/soc/aspeed/aspeed-p2a-ctrl.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,13 +383,11 @@ static int aspeed_p2a_ctrl_probe(struct platform_device *pdev)
383383
return rc;
384384
}
385385

386-
static int aspeed_p2a_ctrl_remove(struct platform_device *pdev)
386+
static void aspeed_p2a_ctrl_remove(struct platform_device *pdev)
387387
{
388388
struct aspeed_p2a_ctrl *p2a_ctrl = dev_get_drvdata(&pdev->dev);
389389

390390
misc_deregister(&p2a_ctrl->miscdev);
391-
392-
return 0;
393391
}
394392

395393
#define SCU2C_DRAM BIT(25)
@@ -433,7 +431,7 @@ static struct platform_driver aspeed_p2a_ctrl_driver = {
433431
.of_match_table = aspeed_p2a_ctrl_match,
434432
},
435433
.probe = aspeed_p2a_ctrl_probe,
436-
.remove = aspeed_p2a_ctrl_remove,
434+
.remove_new = aspeed_p2a_ctrl_remove,
437435
};
438436

439437
module_platform_driver(aspeed_p2a_ctrl_driver);

drivers/soc/aspeed/aspeed-uart-routing.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -565,14 +565,12 @@ static int aspeed_uart_routing_probe(struct platform_device *pdev)
565565
return 0;
566566
}
567567

568-
static int aspeed_uart_routing_remove(struct platform_device *pdev)
568+
static void aspeed_uart_routing_remove(struct platform_device *pdev)
569569
{
570570
struct device *dev = &pdev->dev;
571571
struct aspeed_uart_routing *uart_routing = platform_get_drvdata(pdev);
572572

573573
sysfs_remove_group(&dev->kobj, uart_routing->attr_grp);
574-
575-
return 0;
576574
}
577575

578576
static const struct of_device_id aspeed_uart_routing_table[] = {
@@ -591,7 +589,7 @@ static struct platform_driver aspeed_uart_routing_driver = {
591589
.of_match_table = aspeed_uart_routing_table,
592590
},
593591
.probe = aspeed_uart_routing_probe,
594-
.remove = aspeed_uart_routing_remove,
592+
.remove_new = aspeed_uart_routing_remove,
595593
};
596594

597595
module_platform_driver(aspeed_uart_routing_driver);

0 commit comments

Comments
 (0)