Commit b498c14e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Thierry Reding
Browse files

pwm: bcm-iproc: Simplify using devm functions 

With devm_clk_get_enabled() the call to clk_disable_unprepare() can be
dropped from the error path and the remove callback. With
devm_pwmchip_add() pwmchip_remove() can be dropped. Then the remove
callback is empty and can go away, too.

Also use dev_err_probe() for simplified (and improved) error reporting.

Link: https://lore.kernel.org/r/20230929161918.2410424-2-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 8151b37b

drivers/pwm/pwm-bcm-iproc.c

+9 −28
Original line number Diff line number Diff line
@@ -206,18 +206,10 @@ static int iproc_pwmc_probe(struct platform_device *pdev) 
	if (IS_ERR(ip->base))

		return PTR_ERR(ip->base);



	ip->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(ip->clk)) {

		dev_err(&pdev->dev, "failed to get clock: %ld\n",

			PTR_ERR(ip->clk));

		return PTR_ERR(ip->clk);

	}



	ret = clk_prepare_enable(ip->clk);

	if (ret < 0) {

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

		return ret;

	}

	ip->clk = devm_clk_get_enabled(&pdev->dev, NULL);

	if (IS_ERR(ip->clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(ip->clk),

				     "failed to get clock\n");



	/* Set full drive and normal polarity for all channels */

	value = readl(ip->base + IPROC_PWM_CTRL_OFFSET);
@@ -229,22 +221,12 @@ static int iproc_pwmc_probe(struct platform_device *pdev) 


	writel(value, ip->base + IPROC_PWM_CTRL_OFFSET);



	ret = pwmchip_add(&ip->chip);

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to add PWM chip: %d\n", ret);

		clk_disable_unprepare(ip->clk);

	}



	return ret;

}



static void iproc_pwmc_remove(struct platform_device *pdev)

{

	struct iproc_pwmc *ip = platform_get_drvdata(pdev);

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

	if (ret < 0)

		return dev_err_probe(&pdev->dev, ret,

				     "failed to add PWM chip\n");



	pwmchip_remove(&ip->chip);



	clk_disable_unprepare(ip->clk);

	return 0;

}



static const struct of_device_id bcm_iproc_pwmc_dt[] = {
@@ -259,7 +241,6 @@ static struct platform_driver iproc_pwmc_driver = { 
		.of_match_table = bcm_iproc_pwmc_dt,

	},

	.probe = iproc_pwmc_probe,

	.remove_new = iproc_pwmc_remove,

};

module_platform_driver(iproc_pwmc_driver);