Commit a2c795b6 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Dmitry Torokhov
Browse files

Input: bcm-keypad - simplify with dev_err_probe() 



Common pattern of handling deferred probe can be simplified with
dev_err_probe() and devm_clk_get_optional().  Less code and the error
value gets printed.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230625162817.100397-23-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 337ac36c

drivers/input/keyboard/bcm-keypad.c

+4 −10
Original line number Diff line number Diff line
@@ -365,17 +365,11 @@ static int bcm_kp_probe(struct platform_device *pdev) 
		return PTR_ERR(kp->base);



	/* Enable clock */

	kp->clk = devm_clk_get(&pdev->dev, "peri_clk");

	kp->clk = devm_clk_get_optional(&pdev->dev, "peri_clk");

	if (IS_ERR(kp->clk)) {

		error = PTR_ERR(kp->clk);

		if (error != -ENOENT) {

			if (error != -EPROBE_DEFER)

				dev_err(&pdev->dev, "Failed to get clock\n");

			return error;

		}

		dev_dbg(&pdev->dev,

			"No clock specified. Assuming it's enabled\n");

		kp->clk = NULL;

		return dev_err_probe(&pdev->dev, error, "Failed to get clock\n");

	} else if (!kp->clk) {

		dev_dbg(&pdev->dev, "No clock specified. Assuming it's enabled\n");

	} else {

		unsigned int desired_rate;

		long actual_rate;