Skip to content

Commit 05c9b6f

Browse files
Uwe Kleine-Königthierryreding
authored andcommitted
pwm: mtk-disp: Simplify using devm_pwmchip_add()
With devm_pwmchip_add() pwmchip_remove() can be dropped from the remove callback. Then the remove callback is empty and can go away, too. With mtk_disp_pwm_remove() the last user of platform_get_drvdata() is gone and so platform_set_drvdata() can be dropped, too. Also use dev_err_probe() for simplified (and improved) error reporting. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
1 parent 92fcd5b commit 05c9b6f

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

drivers/pwm/pwm-mtk-disp.c

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -246,34 +246,25 @@ static int mtk_disp_pwm_probe(struct platform_device *pdev)
246246

247247
mdp->clk_main = devm_clk_get(&pdev->dev, "main");
248248
if (IS_ERR(mdp->clk_main))
249-
return PTR_ERR(mdp->clk_main);
249+
return dev_err_probe(&pdev->dev, PTR_ERR(mdp->clk_main),
250+
"Failed to get main clock\n");
250251

251252
mdp->clk_mm = devm_clk_get(&pdev->dev, "mm");
252253
if (IS_ERR(mdp->clk_mm))
253-
return PTR_ERR(mdp->clk_mm);
254+
return dev_err_probe(&pdev->dev, PTR_ERR(mdp->clk_mm),
255+
"Failed to get mm clock\n");
254256

255257
mdp->chip.dev = &pdev->dev;
256258
mdp->chip.ops = &mtk_disp_pwm_ops;
257259
mdp->chip.npwm = 1;
258260

259-
ret = pwmchip_add(&mdp->chip);
260-
if (ret < 0) {
261-
dev_err(&pdev->dev, "pwmchip_add() failed: %pe\n", ERR_PTR(ret));
262-
return ret;
263-
}
264-
265-
platform_set_drvdata(pdev, mdp);
261+
ret = devm_pwmchip_add(&pdev->dev, &mdp->chip);
262+
if (ret < 0)
263+
return dev_err_probe(&pdev->dev, ret, "pwmchip_add() failed\n");
266264

267265
return 0;
268266
}
269267

270-
static void mtk_disp_pwm_remove(struct platform_device *pdev)
271-
{
272-
struct mtk_disp_pwm *mdp = platform_get_drvdata(pdev);
273-
274-
pwmchip_remove(&mdp->chip);
275-
}
276-
277268
static const struct mtk_pwm_data mt2701_pwm_data = {
278269
.enable_mask = BIT(16),
279270
.con0 = 0xa8,
@@ -319,7 +310,6 @@ static struct platform_driver mtk_disp_pwm_driver = {
319310
.of_match_table = mtk_disp_pwm_of_match,
320311
},
321312
.probe = mtk_disp_pwm_probe,
322-
.remove_new = mtk_disp_pwm_remove,
323313
};
324314
module_platform_driver(mtk_disp_pwm_driver);
325315

0 commit comments

Comments
 (0)