Skip to content

Commit 4527a21

Browse files
Uwe Kleine-Königbp3tk0v
authored andcommitted
EDAC/versal: 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 this, 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> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Shubhrajyoti Datta <shubhrajyoti.datta@amd.com> Link: https://lore.kernel.org/r/83deca1ce260f7e17ff3cb106c9a6946d4ca4505.1709886922.git.u.kleine-koenig@pengutronix.de
1 parent 83bf240 commit 4527a21

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/edac/versal_edac.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ static int mc_probe(struct platform_device *pdev)
11601160
return rc;
11611161
}
11621162

1163-
static int mc_remove(struct platform_device *pdev)
1163+
static void mc_remove(struct platform_device *pdev)
11641164
{
11651165
struct mem_ctl_info *mci = platform_get_drvdata(pdev);
11661166
struct edac_priv *priv = mci->pvt_info;
@@ -1178,8 +1178,6 @@ static int mc_remove(struct platform_device *pdev)
11781178
XPM_EVENT_ERROR_MASK_DDRMC_NCR, err_callback, mci);
11791179
edac_mc_del_mc(&pdev->dev);
11801180
edac_mc_free(mci);
1181-
1182-
return 0;
11831181
}
11841182

11851183
static struct platform_driver xilinx_ddr_edac_mc_driver = {
@@ -1188,7 +1186,7 @@ static struct platform_driver xilinx_ddr_edac_mc_driver = {
11881186
.of_match_table = xlnx_edac_match,
11891187
},
11901188
.probe = mc_probe,
1191-
.remove = mc_remove,
1189+
.remove_new = mc_remove,
11921190
};
11931191

11941192
module_platform_driver(xilinx_ddr_edac_mc_driver);

0 commit comments

Comments
 (0)