diff options
| author | Krzysztof Kozlowski <[email protected]> | 2023-06-25 18:28:15 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-07-07 16:54:30 -0700 |
| commit | a2c795b696b20ebc56462a2fbbc0d612ef265389 (patch) | |
| tree | 7cc8f1541fc754c27182df9698ad5a8e140e9539 | |
| parent | 337ac36c3bc0be71e73322cbbc0d6a8b8a2c05f6 (diff) | |
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: Krzysztof Kozlowski <[email protected]>
Reviewed-by: Hans de Goede <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Dmitry Torokhov <[email protected]>
| -rw-r--r-- | drivers/input/keyboard/bcm-keypad.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/input/keyboard/bcm-keypad.c b/drivers/input/keyboard/bcm-keypad.c index 56a919ec23b5..05b09066df84 100644 --- a/drivers/input/keyboard/bcm-keypad.c +++ b/drivers/input/keyboard/bcm-keypad.c @@ -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; |