]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: accel: adxl345: make data struct variable irq function local
authorLothar Rubusch <l.rubusch@gmail.com>
Tue, 10 Jun 2025 21:59:24 +0000 (21:59 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Thu, 26 Jun 2025 18:32:55 +0000 (19:32 +0100)
Remove variable irq from the struct state and make it a function local
variable, because it is not necessary to be kept struct-wise.

This is a refactoring change and should not impact functionality.

Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
Link: https://patch.msgid.link/20250610215933.84795-3-l.rubusch@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/accel/adxl345_core.c

index 95eb596b7d9698c0fc6135b84766c2afe3dcfa0d..00c11402ef3a69807431c6dc37d883ca2a00cc04 100644 (file)
@@ -133,7 +133,6 @@ struct adxl345_state {
        const struct adxl345_chip_info *info;
        struct regmap *regmap;
        bool fifo_delay; /* delay: delay is needed for SPI */
-       int irq;
        u8 watermark;
        u8 fifo_mode;
 
@@ -1120,6 +1119,7 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap,
                                         ADXL345_DATA_FORMAT_FULL_RES |
                                         ADXL345_DATA_FORMAT_SELF_TEST);
        unsigned int tap_threshold;
+       int irq;
        int ret;
 
        indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
@@ -1204,11 +1204,11 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap,
        if (ret)
                return ret;
 
-       st->irq = fwnode_irq_get_byname(dev_fwnode(dev), "INT1");
-       if (st->irq < 0) {
+       irq = fwnode_irq_get_byname(dev_fwnode(dev), "INT1");
+       if (irq < 0) {
                intio = ADXL345_INT2;
-               st->irq = fwnode_irq_get_byname(dev_fwnode(dev), "INT2");
-               if (st->irq < 0)
+               irq = fwnode_irq_get_byname(dev_fwnode(dev), "INT2");
+               if (irq < 0)
                        intio = ADXL345_INT_NONE;
        }
 
@@ -1233,7 +1233,7 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap,
                if (ret)
                        return ret;
 
-               ret = devm_request_threaded_irq(dev, st->irq, NULL,
+               ret = devm_request_threaded_irq(dev, irq, NULL,
                                                &adxl345_irq_handler,
                                                IRQF_SHARED | IRQF_ONESHOT,
                                                indio_dev->name, indio_dev);