]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
iio: adc: ad7280a: simplify with cleanup.h
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Fri, 5 Jul 2024 10:40:45 +0000 (12:40 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 29 Jul 2024 19:31:11 +0000 (20:31 +0100)
Allocate the memory with scoped/cleanup.h to reduce error handling and
make the code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://patch.msgid.link/20240705-cleanup-h-iio-v1-2-77114c7e84c5@linaro.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/ad7280a.c

index d4a4e15c82447cae5b917d860330916f5abb60ec..7bfa090da4dfa791e684309e1a98747814ec2f42 100644 (file)
@@ -7,6 +7,7 @@
 
 #include <linux/bitfield.h>
 #include <linux/bits.h>
+#include <linux/cleanup.h>
 #include <linux/crc8.h>
 #include <linux/delay.h>
 #include <linux/device.h>
@@ -803,16 +804,16 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)
 {
        struct iio_dev *indio_dev = private;
        struct ad7280_state *st = iio_priv(indio_dev);
-       unsigned int *channels;
        int i, ret;
 
-       channels = kcalloc(st->scan_cnt, sizeof(*channels), GFP_KERNEL);
+       unsigned int *channels __free(kfree) = kcalloc(st->scan_cnt, sizeof(*channels),
+                                                      GFP_KERNEL);
        if (!channels)
                return IRQ_HANDLED;
 
        ret = ad7280_read_all_channels(st, st->scan_cnt, channels);
        if (ret < 0)
-               goto out;
+               return IRQ_HANDLED;
 
        for (i = 0; i < st->scan_cnt; i++) {
                unsigned int val;
@@ -852,9 +853,6 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)
                }
        }
 
-out:
-       kfree(channels);
-
        return IRQ_HANDLED;
 }