| Message ID | 20240823230056.745872-1-andy.shevchenko@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,1/1] iio: accel: bmc150: use fwnode_irq_get_byname() | expand |
On Sat, 24 Aug 2024 02:00:56 +0300 Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > Use the generic fwnode_irq_get_byname() in place of of_irq_get_byname() > to get the IRQ number from the interrupt pin. > > Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com> Applied > --- > drivers/iio/accel/bmc150-accel-core.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c > index 03121d020470..14ce03c70ab5 100644 > --- a/drivers/iio/accel/bmc150-accel-core.c > +++ b/drivers/iio/accel/bmc150-accel-core.c > @@ -10,9 +10,9 @@ > #include <linux/delay.h> > #include <linux/slab.h> > #include <linux/acpi.h> > -#include <linux/of_irq.h> > #include <linux/pm.h> > #include <linux/pm_runtime.h> > +#include <linux/property.h> > #include <linux/iio/iio.h> > #include <linux/iio/sysfs.h> > #include <linux/iio/buffer.h> > @@ -514,7 +514,7 @@ static void bmc150_accel_interrupts_setup(struct iio_dev *indio_dev, > */ > irq_info = bmc150_accel_interrupts_int1; > if (data->type == BOSCH_BMC156 || > - irq == of_irq_get_byname(dev->of_node, "INT2")) > + irq == fwnode_irq_get_byname(dev_fwnode(dev), "INT2")) > irq_info = bmc150_accel_interrupts_int2; > > for (i = 0; i < BMC150_ACCEL_INTERRUPTS; i++)
diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c index 03121d020470..14ce03c70ab5 100644 --- a/drivers/iio/accel/bmc150-accel-core.c +++ b/drivers/iio/accel/bmc150-accel-core.c @@ -10,9 +10,9 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <linux/of_irq.h> #include <linux/pm.h> #include <linux/pm_runtime.h> +#include <linux/property.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> #include <linux/iio/buffer.h> @@ -514,7 +514,7 @@ static void bmc150_accel_interrupts_setup(struct iio_dev *indio_dev, */ irq_info = bmc150_accel_interrupts_int1; if (data->type == BOSCH_BMC156 || - irq == of_irq_get_byname(dev->of_node, "INT2")) + irq == fwnode_irq_get_byname(dev_fwnode(dev), "INT2")) irq_info = bmc150_accel_interrupts_int2; for (i = 0; i < BMC150_ACCEL_INTERRUPTS; i++)
Use the generic fwnode_irq_get_byname() in place of of_irq_get_byname() to get the IRQ number from the interrupt pin. Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com> --- drivers/iio/accel/bmc150-accel-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)