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

pwm: berlin: 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.

Link: https://lore.kernel.org/r/20230718175545.3946935-1-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 a6e5654e

drivers/pwm/pwm-berlin.c

+4 −21
Original line number Diff line number Diff line
@@ -209,39 +209,23 @@ static int berlin_pwm_probe(struct platform_device *pdev) 
	if (IS_ERR(bpc->base))

		return PTR_ERR(bpc->base);



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

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

	if (IS_ERR(bpc->clk))

		return PTR_ERR(bpc->clk);



	ret = clk_prepare_enable(bpc->clk);

	if (ret)

		return ret;



	bpc->chip.dev = &pdev->dev;

	bpc->chip.ops = &berlin_pwm_ops;

	bpc->chip.npwm = BERLIN_PWM_NUMPWMS;



	ret = pwmchip_add(&bpc->chip);

	if (ret < 0) {

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

		clk_disable_unprepare(bpc->clk);

		return ret;

	}

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

	if (ret < 0)

		return dev_err_probe(&pdev->dev, ret, "failed to add PWM chip\n");



	platform_set_drvdata(pdev, bpc);



	return 0;

}



static void berlin_pwm_remove(struct platform_device *pdev)

{

	struct berlin_pwm_chip *bpc = platform_get_drvdata(pdev);



	pwmchip_remove(&bpc->chip);



	clk_disable_unprepare(bpc->clk);

}



#ifdef CONFIG_PM_SLEEP

static int berlin_pwm_suspend(struct device *dev)

{
@@ -290,7 +274,6 @@ static SIMPLE_DEV_PM_OPS(berlin_pwm_pm_ops, berlin_pwm_suspend, 


static struct platform_driver berlin_pwm_driver = {

	.probe = berlin_pwm_probe,

	.remove_new = berlin_pwm_remove,

	.driver = {

		.name = "berlin-pwm",

		.of_match_table = berlin_pwm_match,