UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <krzysztof.kozlowski@linaro.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20230625162817.100397-23-krzysztof.kozlowski@linaro.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Krzysztof Kozlowski 2023-06-25 18:28:15 +02:00 committed by Dmitry Torokhov
parent 337ac36c3b
commit a2c795b696
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/input/keyboard/bcm-keypad.c
View File

@ -365,17 +365,11 @@ static int bcm_kp_probe(struct platform_device *pdev)
return PTR_ERR(kp->base); return PTR_ERR(kp->base);
/* Enable clock */ /* 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)) { if (IS_ERR(kp->clk)) {
error = PTR_ERR(kp->clk); return dev_err_probe(&pdev->dev, error, "Failed to get clock\n");
if (error != -ENOENT) { } else if (!kp->clk) {
if (error != -EPROBE_DEFER) dev_dbg(&pdev->dev, "No clock specified. Assuming it's enabled\n");
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;
} else { } else {
unsigned int desired_rate; unsigned int desired_rate;
long actual_rate; long actual_rate;