iio: adc: at91_adc: Use devm_request_irq() helper function
authorJinjie Ruan <ruanjinjie@huawei.com>
Mon, 28 Aug 2023 06:45:44 +0000 (14:45 +0800)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 11 Sep 2023 19:12:41 +0000 (20:12 +0100)
Use devm_request_irq() to request the interrupt, so we can avoid
having to manually clean this up.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20230828064546.2383857-2-ruanjinjie@huawei.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/at91_adc.c

index de6650f9c4b1c2c0bef2be5bf6dd730e72db30bf..771ad5c4a13185f6c1e51d9bb335af3308112316 100644 (file)
@@ -1077,11 +1077,13 @@ static int at91_adc_probe(struct platform_device *pdev)
        at91_adc_writel(st, AT91_ADC_IDR, 0xFFFFFFFF);
 
        if (st->caps->has_tsmr)
-               ret = request_irq(st->irq, at91_adc_9x5_interrupt, 0,
-                                 pdev->dev.driver->name, idev);
+               ret = devm_request_irq(&pdev->dev, st->irq,
+                                      at91_adc_9x5_interrupt, 0,
+                                      pdev->dev.driver->name, idev);
        else
-               ret = request_irq(st->irq, at91_adc_rl_interrupt, 0,
-                                 pdev->dev.driver->name, idev);
+               ret = devm_request_irq(&pdev->dev, st->irq,
+                                      at91_adc_rl_interrupt, 0,
+                                      pdev->dev.driver->name, idev);
        if (ret) {
                dev_err(&pdev->dev, "Failed to allocate IRQ.\n");
                return ret;
@@ -1090,15 +1092,14 @@ static int at91_adc_probe(struct platform_device *pdev)
        st->clk = devm_clk_get(&pdev->dev, "adc_clk");
        if (IS_ERR(st->clk)) {
                dev_err(&pdev->dev, "Failed to get the clock.\n");
-               ret = PTR_ERR(st->clk);
-               goto error_free_irq;
+               return PTR_ERR(st->clk);
        }
 
        ret = clk_prepare_enable(st->clk);
        if (ret) {
                dev_err(&pdev->dev,
                        "Could not prepare or enable the clock.\n");
-               goto error_free_irq;
+               return ret;
        }
 
        st->adc_clk = devm_clk_get(&pdev->dev, "adc_op_clk");
@@ -1211,8 +1212,6 @@ error_disable_adc_clk:
        clk_disable_unprepare(st->adc_clk);
 error_disable_clk:
        clk_disable_unprepare(st->clk);
-error_free_irq:
-       free_irq(st->irq, idev);
        return ret;
 }
 
@@ -1230,7 +1229,6 @@ static int at91_adc_remove(struct platform_device *pdev)
        }
        clk_disable_unprepare(st->adc_clk);
        clk_disable_unprepare(st->clk);
-       free_irq(st->irq, idev);
 
        return 0;
 }