]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
gpio: mlxbf2: use dev_err_probe() where applicable
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tue, 26 Aug 2025 09:35:05 +0000 (11:35 +0200)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Wed, 3 Sep 2025 07:37:47 +0000 (09:37 +0200)
Simplify error handling and shrink the code by using dev_err_probe()
consistently across the driver.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20250826-gpio-mmio-gpio-conv-part2-v1-4-f67603e4b27e@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
drivers/gpio/gpio-mlxbf2.c

index 390f2e74a9d8193f924ee50f4a8f2d7bc6ae2168..bc4bba8b567c2605a77d4f9d4d7d916e8b096569 100644 (file)
@@ -369,10 +369,8 @@ mlxbf2_gpio_probe(struct platform_device *pdev)
                return PTR_ERR(gs->gpio_io);
 
        ret = mlxbf2_gpio_get_lock_res(pdev);
-       if (ret) {
-               dev_err(dev, "Failed to get yu_arm_gpio_lock resource\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed to get yu_arm_gpio_lock resource\n");
 
        if (device_property_read_u32(dev, "npins", &npins))
                npins = MLXBF2_GPIO_MAX_PINS_PER_BLOCK;
@@ -387,10 +385,8 @@ mlxbf2_gpio_probe(struct platform_device *pdev)
                        NULL,
                        0);
 
-       if (ret) {
-               dev_err(dev, "bgpio_init failed\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "bgpio_init failed\n");
 
        gc->direction_input = mlxbf2_gpio_direction_input;
        gc->direction_output = mlxbf2_gpio_direction_output;
@@ -414,19 +410,15 @@ mlxbf2_gpio_probe(struct platform_device *pdev)
                 */
                ret = devm_request_irq(dev, irq, mlxbf2_gpio_irq_handler,
                                       IRQF_SHARED, name, gs);
-               if (ret) {
-                       dev_err(dev, "failed to request IRQ");
-                       return ret;
-               }
+               if (ret)
+                       return dev_err_probe(dev, ret, "failed to request IRQ");
        }
 
        platform_set_drvdata(pdev, gs);
 
        ret = devm_gpiochip_add_data(dev, &gs->gc, gs);
-       if (ret) {
-               dev_err(dev, "Failed adding memory mapped gpiochip\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed adding memory mapped gpiochip\n");
 
        return 0;
 }