iio: accel: fxls8962af: Switch from of specific to fwnode based properties.
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 18 Feb 2024 17:27:30 +0000 (17:27 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 25 Mar 2024 19:50:10 +0000 (19:50 +0000)
Only the irq was retrieved using an of specific accessor. Switch to the
fwnode equivalent and adjust headers. Also include missing mod_devicetable.h
and irq.h.

Cc: Sean Nyekjaer <sean@geanix.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240218172731.1023367-8-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/accel/fxls8962af-core.c

index be8a15cb945fdf9c007eac135347e2af3c7b7b09..4fbc01bda62e4ccc06f993ac244ac99a7c32c19a 100644 (file)
 #include <linux/bits.h>
 #include <linux/bitfield.h>
 #include <linux/i2c.h>
+#include <linux/irq.h>
 #include <linux/module.h>
-#include <linux/of_irq.h>
+#include <linux/mod_devicetable.h>
 #include <linux/pm_runtime.h>
+#include <linux/property.h>
 #include <linux/regulator/consumer.h>
 #include <linux/regmap.h>
 
@@ -1062,12 +1064,12 @@ static void fxls8962af_pm_disable(void *dev_ptr)
        fxls8962af_standby(iio_priv(indio_dev));
 }
 
-static void fxls8962af_get_irq(struct device_node *of_node,
+static void fxls8962af_get_irq(struct device *dev,
                               enum fxls8962af_int_pin *pin)
 {
        int irq;
 
-       irq = of_irq_get_byname(of_node, "INT2");
+       irq = fwnode_irq_get_byname(dev_fwnode(dev), "INT2");
        if (irq > 0) {
                *pin = FXLS8962AF_PIN_INT2;
                return;
@@ -1086,7 +1088,7 @@ static int fxls8962af_irq_setup(struct iio_dev *indio_dev, int irq)
        u8 int_pin_sel;
        int ret;
 
-       fxls8962af_get_irq(dev->of_node, &int_pin);
+       fxls8962af_get_irq(dev, &int_pin);
        switch (int_pin) {
        case FXLS8962AF_PIN_INT1:
                int_pin_sel = FXLS8962AF_INT_PIN_SEL_INT1;