Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19e45307 authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

pwm: sti: Avoid conditional gotos 



[ Upstream commit fd3ae02bb66f091e55f363d32eca7b4039977bf5 ]

Using gotos for conditional code complicates this code significantly.
Convert the code to simple conditional blocks to increase readability.

Suggested-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
Stable-dep-of: 2d6812b41e0d ("pwm: sti: Reduce number of allocations and drop usage of chip_data")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c4d5179e

drivers/pwm/pwm-sti.c

+22 −26
Original line number Diff line number Diff line
@@ -593,9 +593,7 @@ static int sti_pwm_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	if (!cdata->pwm_num_devs)

		goto skip_pwm;



	if (cdata->pwm_num_devs) {

		pc->pwm_clk = of_clk_get_by_name(dev->of_node, "pwm");

		if (IS_ERR(pc->pwm_clk)) {

			dev_err(dev, "failed to get PWM clock\n");
@@ -607,11 +605,9 @@ static int sti_pwm_probe(struct platform_device *pdev) 
			dev_err(dev, "failed to prepare clock\n");

			return ret;

		}

	}



skip_pwm:

	if (!cdata->cpt_num_devs)

		goto skip_cpt;



	if (cdata->cpt_num_devs) {

		pc->cpt_clk = of_clk_get_by_name(dev->of_node, "capture");

		if (IS_ERR(pc->cpt_clk)) {

			dev_err(dev, "failed to get PWM capture clock\n");
@@ -623,8 +619,8 @@ static int sti_pwm_probe(struct platform_device *pdev) 
			dev_err(dev, "failed to prepare clock\n");

			return ret;

		}

	}



skip_cpt:

	pc->chip.dev = dev;

	pc->chip.ops = &sti_pwm_ops;

	pc->chip.base = -1;