Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
AngeloGioacchino Del Regno
and committed by
Thierry Reding
5264e8ca
0d6bc3e1
+11
-19
+11
-19
drivers/pwm/pwm-mediatek.c
+11
-19
drivers/pwm/pwm-mediatek.c
···
227
227
return -ENOMEM;
228
228
229
229
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");
235
233
236
234
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");
242
238
243
239
for (i = 0; i < pc->soc->num_pwms; i++) {
244
240
char name[8];
···
242
246
snprintf(name, sizeof(name), "pwm%d", i + 1);
243
247
244
248
pc->clk_pwms[i] = devm_clk_get(&pdev->dev, name);
245
-
if (IS_ERR(pc->clk_pwms[i])) {
246
-
dev_err(&pdev->dev, "clock: %s fail: %ld\n",
247
-
name, PTR_ERR(pc->clk_pwms[i]));
248
-
return PTR_ERR(pc->clk_pwms[i]);
249
-
}
249
+
if (IS_ERR(pc->clk_pwms[i]))
250
+
return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk_pwms[i]),
251
+
"clock: %s failed\n", name);
250
252
}
251
253
252
254
pc->chip.dev = &pdev->dev;
···
252
258
pc->chip.npwm = pc->soc->num_pwms;
253
259
254
260
ret = devm_pwmchip_add(&pdev->dev, &pc->chip);
255
-
if (ret < 0) {
256
-
dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret);
257
-
return ret;
258
-
}
261
+
if (ret < 0)
262
+
return dev_err_probe(&pdev->dev, ret, "pwmchip_add() failed\n");
259
263
260
264
return 0;
261
265
}