Skip to content

Commit 5264e8c

Browse files
AngeloGioacchino Del Regnothierryreding
authored andcommitted
pwm: pwm-mediatek: Simplify error handling with dev_err_probe()
Use dev_err_probe() to simplify handling errors in pwm_mediatek_probe(). Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
1 parent 0d6bc3e commit 5264e8c

1 file changed

Lines changed: 11 additions & 19 deletions

File tree

drivers/pwm/pwm-mediatek.c

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -227,41 +227,33 @@ static int pwm_mediatek_probe(struct platform_device *pdev)
227227
return -ENOMEM;
228228

229229
pc->clk_top = devm_clk_get(&pdev->dev, "top");
230-
if (IS_ERR(pc->clk_top)) {
231-
dev_err(&pdev->dev, "clock: top fail: %ld\n",
232-
PTR_ERR(pc->clk_top));
233-
return PTR_ERR(pc->clk_top);
234-
}
230+
if (IS_ERR(pc->clk_top))
231+
return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk_top),
232+
"clock: top failed\n");
235233

236234
pc->clk_main = devm_clk_get(&pdev->dev, "main");
237-
if (IS_ERR(pc->clk_main)) {
238-
dev_err(&pdev->dev, "clock: main fail: %ld\n",
239-
PTR_ERR(pc->clk_main));
240-
return PTR_ERR(pc->clk_main);
241-
}
235+
if (IS_ERR(pc->clk_main))
236+
return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk_main),
237+
"clock: main failed\n");
242238

243239
for (i = 0; i < pc->soc->num_pwms; i++) {
244240
char name[8];
245241

246242
snprintf(name, sizeof(name), "pwm%d", i + 1);
247243

248244
pc->clk_pwms[i] = devm_clk_get(&pdev->dev, name);
249-
if (IS_ERR(pc->clk_pwms[i])) {
250-
dev_err(&pdev->dev, "clock: %s fail: %ld\n",
251-
name, PTR_ERR(pc->clk_pwms[i]));
252-
return PTR_ERR(pc->clk_pwms[i]);
253-
}
245+
if (IS_ERR(pc->clk_pwms[i]))
246+
return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk_pwms[i]),
247+
"clock: %s failed\n", name);
254248
}
255249

256250
pc->chip.dev = &pdev->dev;
257251
pc->chip.ops = &pwm_mediatek_ops;
258252
pc->chip.npwm = pc->soc->num_pwms;
259253

260254
ret = devm_pwmchip_add(&pdev->dev, &pc->chip);
261-
if (ret < 0) {
262-
dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret);
263-
return ret;
264-
}
255+
if (ret < 0)
256+
return dev_err_probe(&pdev->dev, ret, "pwmchip_add() failed\n");
265257

266258
return 0;
267259
}

0 commit comments

Comments
 (0)