]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
gpio: stmpe: Fix IRQ related error messages
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 2 Sep 2024 13:30:40 +0000 (16:30 +0300)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Wed, 4 Sep 2024 07:02:43 +0000 (09:02 +0200)
First of all, remove duplicate message that platform_get_irq()
does already print. Second, correct the error message when unable
to register a handler, which is broken in two ways:
1) the misleading 'get' vs. 'register';
2) missing '\n' at the end.

(Yes, for the curious ones, the dev_*() cases do not require '\n'
and issue it automatically, but it's better to have them explicit)

Fix all this here.

Fixes: 1882e769362b ("gpio: stmpe: Simplify with dev_err_probe()")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240902133148.2569486-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
drivers/gpio/gpio-stmpe.c

index abd42a975b09f419a8e12ecb501eb0b2d8c90b0a..4e171f9075bf4c875781092a645603d0bcdeaf02 100644 (file)
@@ -464,6 +464,7 @@ static void stmpe_gpio_disable(void *stmpe)
 
 static int stmpe_gpio_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);
        struct device_node *np = pdev->dev.of_node;
        struct stmpe_gpio *stmpe_gpio;
@@ -493,12 +494,6 @@ static int stmpe_gpio_probe(struct platform_device *pdev)
        of_property_read_u32(np, "st,norequest-mask",
                        &stmpe_gpio->norequest_mask);
 
-       irq = platform_get_irq(pdev, 0);
-       if (irq < 0)
-               dev_info(&pdev->dev,
-                       "device configured in no-irq mode: "
-                       "irqs are not available\n");
-
        ret = stmpe_enable(stmpe, STMPE_BLOCK_GPIO);
        if (ret)
                return ret;
@@ -507,6 +502,7 @@ static int stmpe_gpio_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
+       irq = platform_get_irq(pdev, 0);
        if (irq > 0) {
                struct gpio_irq_chip *girq;
 
@@ -514,8 +510,7 @@ static int stmpe_gpio_probe(struct platform_device *pdev)
                                stmpe_gpio_irq, IRQF_ONESHOT,
                                "stmpe-gpio", stmpe_gpio);
                if (ret)
-                       return dev_err_probe(&pdev->dev, ret,
-                                            "unable to get irq");
+                       return dev_err_probe(dev, ret, "unable to register IRQ handler\n");
 
                girq = &stmpe_gpio->chip.irq;
                gpio_irq_chip_set_chip(girq, &stmpe_gpio_irq_chip);