Skip to content

Commit 776d54c

Browse files
Uwe Kleine-Königlinusw
authored andcommitted
pinctrl: qcom/lpi: 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(). 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> Link: https://lore.kernel.org/r/20231009162510.335208-2-u.kleine-koenig@pengutronix.de Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent 9365055 commit 776d54c

9 files changed

+9
-11
lines changed

drivers/pinctrl/qcom/pinctrl-lpass-lpi.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ int lpi_pinctrl_probe(struct platform_device *pdev)
490490
}
491491
EXPORT_SYMBOL_GPL(lpi_pinctrl_probe);
492492

493-
int lpi_pinctrl_remove(struct platform_device *pdev)
493+
void lpi_pinctrl_remove(struct platform_device *pdev)
494494
{
495495
struct lpi_pinctrl *pctrl = platform_get_drvdata(pdev);
496496
int i;
@@ -500,8 +500,6 @@ int lpi_pinctrl_remove(struct platform_device *pdev)
500500

501501
for (i = 0; i < pctrl->data->npins; i++)
502502
pinctrl_generic_remove_group(pctrl->ctrl, i);
503-
504-
return 0;
505503
}
506504
EXPORT_SYMBOL_GPL(lpi_pinctrl_remove);
507505

drivers/pinctrl/qcom/pinctrl-lpass-lpi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ struct lpi_pinctrl_variant_data {
8585
};
8686

8787
int lpi_pinctrl_probe(struct platform_device *pdev);
88-
int lpi_pinctrl_remove(struct platform_device *pdev);
88+
void lpi_pinctrl_remove(struct platform_device *pdev);
8989

9090
#endif /*__PINCTRL_LPASS_LPI_H__*/

drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ static struct platform_driver lpi_pinctrl_driver = {
158158
.of_match_table = lpi_pinctrl_of_match,
159159
},
160160
.probe = lpi_pinctrl_probe,
161-
.remove = lpi_pinctrl_remove,
161+
.remove_new = lpi_pinctrl_remove,
162162
};
163163

164164
module_platform_driver(lpi_pinctrl_driver);

drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ static struct platform_driver lpi_pinctrl_driver = {
199199
.of_match_table = lpi_pinctrl_of_match,
200200
},
201201
.probe = lpi_pinctrl_probe,
202-
.remove = lpi_pinctrl_remove,
202+
.remove_new = lpi_pinctrl_remove,
203203
};
204204

205205
module_platform_driver(lpi_pinctrl_driver);

drivers/pinctrl/qcom/pinctrl-sm6115-lpass-lpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ static struct platform_driver lpi_pinctrl_driver = {
167167
.of_match_table = lpi_pinctrl_of_match,
168168
},
169169
.probe = lpi_pinctrl_probe,
170-
.remove = lpi_pinctrl_remove,
170+
.remove_new = lpi_pinctrl_remove,
171171
};
172172

173173
module_platform_driver(lpi_pinctrl_driver);

drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ static struct platform_driver lpi_pinctrl_driver = {
155155
.of_match_table = lpi_pinctrl_of_match,
156156
},
157157
.probe = lpi_pinctrl_probe,
158-
.remove = lpi_pinctrl_remove,
158+
.remove_new = lpi_pinctrl_remove,
159159
};
160160

161161
module_platform_driver(lpi_pinctrl_driver);

drivers/pinctrl/qcom/pinctrl-sm8350-lpass-lpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ static struct platform_driver lpi_pinctrl_driver = {
158158
.of_match_table = lpi_pinctrl_of_match,
159159
},
160160
.probe = lpi_pinctrl_probe,
161-
.remove = lpi_pinctrl_remove,
161+
.remove_new = lpi_pinctrl_remove,
162162
};
163163
module_platform_driver(lpi_pinctrl_driver);
164164

drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ static struct platform_driver lpi_pinctrl_driver = {
232232
.of_match_table = lpi_pinctrl_of_match,
233233
},
234234
.probe = lpi_pinctrl_probe,
235-
.remove = lpi_pinctrl_remove,
235+
.remove_new = lpi_pinctrl_remove,
236236
};
237237

238238
module_platform_driver(lpi_pinctrl_driver);

drivers/pinctrl/qcom/pinctrl-sm8550-lpass-lpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ static struct platform_driver lpi_pinctrl_driver = {
240240
.of_match_table = lpi_pinctrl_of_match,
241241
},
242242
.probe = lpi_pinctrl_probe,
243-
.remove = lpi_pinctrl_remove,
243+
.remove_new = lpi_pinctrl_remove,
244244
};
245245

246246
module_platform_driver(lpi_pinctrl_driver);

0 commit comments

Comments
 (0)