Commit 5264e8ca authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Thierry Reding
Browse files

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: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 0d6bc3e1

drivers/pwm/pwm-mediatek.c

+11 −19
Original line number Diff line number Diff line
@@ -227,18 +227,14 @@ static int pwm_mediatek_probe(struct platform_device *pdev) 
		return -ENOMEM;



	pc->clk_top = devm_clk_get(&pdev->dev, "top");

	if (IS_ERR(pc->clk_top)) {

		dev_err(&pdev->dev, "clock: top fail: %ld\n",

			PTR_ERR(pc->clk_top));

		return PTR_ERR(pc->clk_top);

	}

	if (IS_ERR(pc->clk_top))

		return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk_top),

				     "clock: top failed\n");



	pc->clk_main = devm_clk_get(&pdev->dev, "main");

	if (IS_ERR(pc->clk_main)) {

		dev_err(&pdev->dev, "clock: main fail: %ld\n",

			PTR_ERR(pc->clk_main));

		return PTR_ERR(pc->clk_main);

	}

	if (IS_ERR(pc->clk_main))

		return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk_main),

				     "clock: main failed\n");



	for (i = 0; i < pc->soc->num_pwms; i++) {

		char name[8];
@@ -246,11 +242,9 @@ static int pwm_mediatek_probe(struct platform_device *pdev) 
		snprintf(name, sizeof(name), "pwm%d", i + 1);



		pc->clk_pwms[i] = devm_clk_get(&pdev->dev, name);

		if (IS_ERR(pc->clk_pwms[i])) {

			dev_err(&pdev->dev, "clock: %s fail: %ld\n",

				name, PTR_ERR(pc->clk_pwms[i]));

			return PTR_ERR(pc->clk_pwms[i]);

		}

		if (IS_ERR(pc->clk_pwms[i]))

			return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk_pwms[i]),

					     "clock: %s failed\n", name);

	}



	pc->chip.dev = &pdev->dev;
@@ -258,10 +252,8 @@ static int pwm_mediatek_probe(struct platform_device *pdev) 
	pc->chip.npwm = pc->soc->num_pwms;



	ret = devm_pwmchip_add(&pdev->dev, &pc->chip);

	if (ret < 0) {

		dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret);

		return ret;

	}

	if (ret < 0)

		return dev_err_probe(&pdev->dev, ret, "pwmchip_add() failed\n");



	return 0;

}