]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
i2c: stm32f7: use dev_err_probe upon calls of devm_request_irq
authorAlain Volmat <alain.volmat@foss.st.com>
Wed, 30 Jul 2025 13:59:59 +0000 (09:59 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Aug 2025 10:09:06 +0000 (12:09 +0200)
[ Upstream commit a51e224c2f42417e95a3e1a672ade221bcd006ba ]

Convert error handling upon calls of devm_request_irq functions during
the probe of the driver.

Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Stable-dep-of: 6aae87fe7f18 ("i2c: stm32f7: unmap DMA mapped buffer")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/i2c/busses/i2c-stm32f7.c

index cd9c6ffc2e61e3b7cc352a5bf7bf1af496c89dfa..cb9093b43be21b4d854f0e6448eade0b70017099 100644 (file)
@@ -2198,19 +2198,13 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
                                        stm32f7_i2c_isr_event_thread,
                                        IRQF_ONESHOT,
                                        pdev->name, i2c_dev);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to request irq event %i\n",
-                       irq_event);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret, "Failed to request irq event\n");
 
        ret = devm_request_irq(&pdev->dev, irq_error, stm32f7_i2c_isr_error, 0,
                               pdev->name, i2c_dev);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to request irq error %i\n",
-                       irq_error);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret, "Failed to request irq error\n");
 
        setup = of_device_get_match_data(&pdev->dev);
        if (!setup) {