@@ -490,7 +490,7 @@ int lpi_pinctrl_probe(struct platform_device *pdev)
}
EXPORT_SYMBOL_GPL(lpi_pinctrl_probe);
-int lpi_pinctrl_remove(struct platform_device *pdev)
+void lpi_pinctrl_remove(struct platform_device *pdev)
{
struct lpi_pinctrl *pctrl = platform_get_drvdata(pdev);
int i;
@@ -500,8 +500,6 @@ int lpi_pinctrl_remove(struct platform_device *pdev)
for (i = 0; i < pctrl->data->npins; i++)
pinctrl_generic_remove_group(pctrl->ctrl, i);
-
- return 0;
}
EXPORT_SYMBOL_GPL(lpi_pinctrl_remove);
@@ -85,6 +85,6 @@ struct lpi_pinctrl_variant_data {
};
int lpi_pinctrl_probe(struct platform_device *pdev);
-int lpi_pinctrl_remove(struct platform_device *pdev);
+void lpi_pinctrl_remove(struct platform_device *pdev);
#endif /*__PINCTRL_LPASS_LPI_H__*/
@@ -158,7 +158,7 @@ static struct platform_driver lpi_pinctrl_driver = {
.of_match_table = lpi_pinctrl_of_match,
},
.probe = lpi_pinctrl_probe,
- .remove = lpi_pinctrl_remove,
+ .remove_new = lpi_pinctrl_remove,
};
module_platform_driver(lpi_pinctrl_driver);
@@ -199,7 +199,7 @@ static struct platform_driver lpi_pinctrl_driver = {
.of_match_table = lpi_pinctrl_of_match,
},
.probe = lpi_pinctrl_probe,
- .remove = lpi_pinctrl_remove,
+ .remove_new = lpi_pinctrl_remove,
};
module_platform_driver(lpi_pinctrl_driver);
@@ -167,7 +167,7 @@ static struct platform_driver lpi_pinctrl_driver = {
.of_match_table = lpi_pinctrl_of_match,
},
.probe = lpi_pinctrl_probe,
- .remove = lpi_pinctrl_remove,
+ .remove_new = lpi_pinctrl_remove,
};
module_platform_driver(lpi_pinctrl_driver);
@@ -155,7 +155,7 @@ static struct platform_driver lpi_pinctrl_driver = {
.of_match_table = lpi_pinctrl_of_match,
},
.probe = lpi_pinctrl_probe,
- .remove = lpi_pinctrl_remove,
+ .remove_new = lpi_pinctrl_remove,
};
module_platform_driver(lpi_pinctrl_driver);
@@ -158,7 +158,7 @@ static struct platform_driver lpi_pinctrl_driver = {
.of_match_table = lpi_pinctrl_of_match,
},
.probe = lpi_pinctrl_probe,
- .remove = lpi_pinctrl_remove,
+ .remove_new = lpi_pinctrl_remove,
};
module_platform_driver(lpi_pinctrl_driver);
@@ -232,7 +232,7 @@ static struct platform_driver lpi_pinctrl_driver = {
.of_match_table = lpi_pinctrl_of_match,
},
.probe = lpi_pinctrl_probe,
- .remove = lpi_pinctrl_remove,
+ .remove_new = lpi_pinctrl_remove,
};
module_platform_driver(lpi_pinctrl_driver);
@@ -240,7 +240,7 @@ static struct platform_driver lpi_pinctrl_driver = {
.of_match_table = lpi_pinctrl_of_match,
},
.probe = lpi_pinctrl_probe,
- .remove = lpi_pinctrl_remove,
+ .remove_new = lpi_pinctrl_remove,
};
module_platform_driver(lpi_pinctrl_driver);
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(). To convert all those qcom pinctrl drivers, make msm_pinctrl_remove() return void (instead of zero) and use .remove_new in all drivers. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 4 +--- drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 2 +- drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c | 2 +- drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c | 2 +- drivers/pinctrl/qcom/pinctrl-sm6115-lpass-lpi.c | 2 +- drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2 +- drivers/pinctrl/qcom/pinctrl-sm8350-lpass-lpi.c | 2 +- drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c | 2 +- drivers/pinctrl/qcom/pinctrl-sm8550-lpass-lpi.c | 2 +- 9 files changed, 9 insertions(+), 11 deletions(-)