Skip to content

Commit b3af12a

Browse files
Uwe Kleine-KönigChun-Kuang Hu
Uwe Kleine-König
authored and
Chun-Kuang Hu
committed
drm/mediatek: 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 (mostly) ignored 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. Trivially convert the mediatek drm drivers from always returning zero in the remove callback to the void returning variant. Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Jyri Sarha <jyri.sarha@iki.fi> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://patchwork.kernel.org/project/dri-devel/patch/20230801110239.831099-8-u.kleine-koenig@pengutronix.de/ Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
1 parent 61a97de commit b3af12a

14 files changed

+28
-53
lines changed

‎drivers/gpu/drm/mediatek/mtk_cec.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,12 @@ static int mtk_cec_probe(struct platform_device *pdev)
235235
return 0;
236236
}
237237

238-
static int mtk_cec_remove(struct platform_device *pdev)
238+
static void mtk_cec_remove(struct platform_device *pdev)
239239
{
240240
struct mtk_cec *cec = platform_get_drvdata(pdev);
241241

242242
mtk_cec_htplg_irq_disable(cec);
243243
clk_disable_unprepare(cec->clk);
244-
return 0;
245244
}
246245

247246
static const struct of_device_id mtk_cec_of_ids[] = {
@@ -252,7 +251,7 @@ MODULE_DEVICE_TABLE(of, mtk_cec_of_ids);
252251

253252
struct platform_driver mtk_cec_driver = {
254253
.probe = mtk_cec_probe,
255-
.remove = mtk_cec_remove,
254+
.remove_new = mtk_cec_remove,
256255
.driver = {
257256
.name = "mediatek-cec",
258257
.of_match_table = mtk_cec_of_ids,

‎drivers/gpu/drm/mediatek/mtk_disp_aal.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,9 @@ static int mtk_disp_aal_probe(struct platform_device *pdev)
140140
return ret;
141141
}
142142

143-
static int mtk_disp_aal_remove(struct platform_device *pdev)
143+
static void mtk_disp_aal_remove(struct platform_device *pdev)
144144
{
145145
component_del(&pdev->dev, &mtk_disp_aal_component_ops);
146-
147-
return 0;
148146
}
149147

150148
static const struct mtk_disp_aal_data mt8173_aal_driver_data = {
@@ -161,7 +159,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_aal_driver_dt_match);
161159

162160
struct platform_driver mtk_disp_aal_driver = {
163161
.probe = mtk_disp_aal_probe,
164-
.remove = mtk_disp_aal_remove,
162+
.remove_new = mtk_disp_aal_remove,
165163
.driver = {
166164
.name = "mediatek-disp-aal",
167165
.owner = THIS_MODULE,

‎drivers/gpu/drm/mediatek/mtk_disp_ccorr.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,9 @@ static int mtk_disp_ccorr_probe(struct platform_device *pdev)
195195
return ret;
196196
}
197197

198-
static int mtk_disp_ccorr_remove(struct platform_device *pdev)
198+
static void mtk_disp_ccorr_remove(struct platform_device *pdev)
199199
{
200200
component_del(&pdev->dev, &mtk_disp_ccorr_component_ops);
201-
202-
return 0;
203201
}
204202

205203
static const struct mtk_disp_ccorr_data mt8183_ccorr_driver_data = {
@@ -221,7 +219,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_ccorr_driver_dt_match);
221219

222220
struct platform_driver mtk_disp_ccorr_driver = {
223221
.probe = mtk_disp_ccorr_probe,
224-
.remove = mtk_disp_ccorr_remove,
222+
.remove_new = mtk_disp_ccorr_remove,
225223
.driver = {
226224
.name = "mediatek-disp-ccorr",
227225
.owner = THIS_MODULE,

‎drivers/gpu/drm/mediatek/mtk_disp_color.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,9 @@ static int mtk_disp_color_probe(struct platform_device *pdev)
132132
return ret;
133133
}
134134

135-
static int mtk_disp_color_remove(struct platform_device *pdev)
135+
static void mtk_disp_color_remove(struct platform_device *pdev)
136136
{
137137
component_del(&pdev->dev, &mtk_disp_color_component_ops);
138-
139-
return 0;
140138
}
141139

142140
static const struct mtk_disp_color_data mt2701_color_driver_data = {
@@ -164,7 +162,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_color_driver_dt_match);
164162

165163
struct platform_driver mtk_disp_color_driver = {
166164
.probe = mtk_disp_color_probe,
167-
.remove = mtk_disp_color_remove,
165+
.remove_new = mtk_disp_color_remove,
168166
.driver = {
169167
.name = "mediatek-disp-color",
170168
.owner = THIS_MODULE,

‎drivers/gpu/drm/mediatek/mtk_disp_gamma.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,9 @@ static int mtk_disp_gamma_probe(struct platform_device *pdev)
183183
return ret;
184184
}
185185

186-
static int mtk_disp_gamma_remove(struct platform_device *pdev)
186+
static void mtk_disp_gamma_remove(struct platform_device *pdev)
187187
{
188188
component_del(&pdev->dev, &mtk_disp_gamma_component_ops);
189-
190-
return 0;
191189
}
192190

193191
static const struct mtk_disp_gamma_data mt8173_gamma_driver_data = {
@@ -209,7 +207,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_gamma_driver_dt_match);
209207

210208
struct platform_driver mtk_disp_gamma_driver = {
211209
.probe = mtk_disp_gamma_probe,
212-
.remove = mtk_disp_gamma_remove,
210+
.remove_new = mtk_disp_gamma_remove,
213211
.driver = {
214212
.name = "mediatek-disp-gamma",
215213
.owner = THIS_MODULE,

‎drivers/gpu/drm/mediatek/mtk_disp_merge.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,9 @@ static int mtk_disp_merge_probe(struct platform_device *pdev)
295295
return ret;
296296
}
297297

298-
static int mtk_disp_merge_remove(struct platform_device *pdev)
298+
static void mtk_disp_merge_remove(struct platform_device *pdev)
299299
{
300300
component_del(&pdev->dev, &mtk_disp_merge_component_ops);
301-
302-
return 0;
303301
}
304302

305303
static const struct of_device_id mtk_disp_merge_driver_dt_match[] = {
@@ -311,7 +309,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_merge_driver_dt_match);
311309

312310
struct platform_driver mtk_disp_merge_driver = {
313311
.probe = mtk_disp_merge_probe,
314-
.remove = mtk_disp_merge_remove,
312+
.remove_new = mtk_disp_merge_remove,
315313
.driver = {
316314
.name = "mediatek-disp-merge",
317315
.owner = THIS_MODULE,

‎drivers/gpu/drm/mediatek/mtk_disp_ovl.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -562,12 +562,10 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev)
562562
return ret;
563563
}
564564

565-
static int mtk_disp_ovl_remove(struct platform_device *pdev)
565+
static void mtk_disp_ovl_remove(struct platform_device *pdev)
566566
{
567567
component_del(&pdev->dev, &mtk_disp_ovl_component_ops);
568568
pm_runtime_disable(&pdev->dev);
569-
570-
return 0;
571569
}
572570

573571
static const struct mtk_disp_ovl_data mt2701_ovl_driver_data = {
@@ -659,7 +657,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_ovl_driver_dt_match);
659657

660658
struct platform_driver mtk_disp_ovl_driver = {
661659
.probe = mtk_disp_ovl_probe,
662-
.remove = mtk_disp_ovl_remove,
660+
.remove_new = mtk_disp_ovl_remove,
663661
.driver = {
664662
.name = "mediatek-disp-ovl",
665663
.owner = THIS_MODULE,

‎drivers/gpu/drm/mediatek/mtk_disp_rdma.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,13 +380,11 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev)
380380
return ret;
381381
}
382382

383-
static int mtk_disp_rdma_remove(struct platform_device *pdev)
383+
static void mtk_disp_rdma_remove(struct platform_device *pdev)
384384
{
385385
component_del(&pdev->dev, &mtk_disp_rdma_component_ops);
386386

387387
pm_runtime_disable(&pdev->dev);
388-
389-
return 0;
390388
}
391389

392390
static const struct mtk_disp_rdma_data mt2701_rdma_driver_data = {
@@ -428,7 +426,7 @@ MODULE_DEVICE_TABLE(of, mtk_disp_rdma_driver_dt_match);
428426

429427
struct platform_driver mtk_disp_rdma_driver = {
430428
.probe = mtk_disp_rdma_probe,
431-
.remove = mtk_disp_rdma_remove,
429+
.remove_new = mtk_disp_rdma_remove,
432430
.driver = {
433431
.name = "mediatek-disp-rdma",
434432
.owner = THIS_MODULE,

‎drivers/gpu/drm/mediatek/mtk_dp.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2694,7 +2694,7 @@ static int mtk_dp_probe(struct platform_device *pdev)
26942694
return 0;
26952695
}
26962696

2697-
static int mtk_dp_remove(struct platform_device *pdev)
2697+
static void mtk_dp_remove(struct platform_device *pdev)
26982698
{
26992699
struct mtk_dp *mtk_dp = platform_get_drvdata(pdev);
27002700

@@ -2705,8 +2705,6 @@ static int mtk_dp_remove(struct platform_device *pdev)
27052705
platform_device_unregister(mtk_dp->phy_dev);
27062706
if (mtk_dp->audio_pdev)
27072707
platform_device_unregister(mtk_dp->audio_pdev);
2708-
2709-
return 0;
27102708
}
27112709

27122710
#ifdef CONFIG_PM_SLEEP
@@ -2767,7 +2765,7 @@ MODULE_DEVICE_TABLE(of, mtk_dp_of_match);
27672765

27682766
static struct platform_driver mtk_dp_driver = {
27692767
.probe = mtk_dp_probe,
2770-
.remove = mtk_dp_remove,
2768+
.remove_new = mtk_dp_remove,
27712769
.driver = {
27722770
.name = "mediatek-drm-dp",
27732771
.of_match_table = mtk_dp_of_match,

‎drivers/gpu/drm/mediatek/mtk_drm_drv.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ static int mtk_drm_probe(struct platform_device *pdev)
909909
return ret;
910910
}
911911

912-
static int mtk_drm_remove(struct platform_device *pdev)
912+
static void mtk_drm_remove(struct platform_device *pdev)
913913
{
914914
struct mtk_drm_private *private = platform_get_drvdata(pdev);
915915
int i;
@@ -919,8 +919,6 @@ static int mtk_drm_remove(struct platform_device *pdev)
919919
of_node_put(private->mutex_node);
920920
for (i = 0; i < DDP_COMPONENT_DRM_ID_MAX; i++)
921921
of_node_put(private->comp_node[i]);
922-
923-
return 0;
924922
}
925923

926924
static int mtk_drm_sys_prepare(struct device *dev)
@@ -953,7 +951,7 @@ static const struct dev_pm_ops mtk_drm_pm_ops = {
953951

954952
static struct platform_driver mtk_drm_platform_driver = {
955953
.probe = mtk_drm_probe,
956-
.remove = mtk_drm_remove,
954+
.remove_new = mtk_drm_remove,
957955
.driver = {
958956
.name = "mediatek-drm",
959957
.pm = &mtk_drm_pm_ops,

0 commit comments

Comments
 (0)