Commit 9320fc50 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

pwm: jz4740: Don't use dev_err_probe() in .request() 



dev_err_probe() is only supposed to be used in probe functions. While it
probably doesn't hurt, both the EPROBE_DEFER handling and calling
device_set_deferred_probe_reason() are conceptually wrong in the request
callback. So replace the call by dev_err() and a separate return
statement.

This effectively reverts commit c0bfe960 ("pwm: jz4740: Simplify
with dev_err_probe()").

Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240106141302.1253365-2-u.kleine-koenig@pengutronix.de


Fixes: c0bfe960 ("pwm: jz4740: Simplify with dev_err_probe()")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent a297d07b

drivers/pwm/pwm-jz4740.c

+4 −3
Original line number Diff line number Diff line
@@ -61,9 +61,10 @@ static int jz4740_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm) 
	snprintf(name, sizeof(name), "timer%u", pwm->hwpwm);



	clk = clk_get(chip->dev, name);

	if (IS_ERR(clk))

		return dev_err_probe(chip->dev, PTR_ERR(clk),

				     "Failed to get clock\n");

	if (IS_ERR(clk)) {

		dev_err(chip->dev, "error %pe: Failed to get clock\n", clk);

		return PTR_ERR(clk);

	}



	err = clk_prepare_enable(clk);

	if (err < 0) {