Message ID | 20200701120702.365-1-nuno.sa@analog.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | iio: adis16480: Use irq types instead of flags | expand |
On Wed, 1 Jul 2020 14:07:02 +0200 Nuno Sá <nuno.sa@analog.com> wrote: > The value retrieved by `irqd_get_trigger_type()` is not an irq flag. > While the values are the same, the meaning is different. > > Signed-off-by: Nuno Sá <nuno.sa@analog.com> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to poke at it. Thanks, Jonathan > --- > drivers/iio/imu/adis16480.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c > index 5163749f568e..1eb4f98076f1 100644 > --- a/drivers/iio/imu/adis16480.c > +++ b/drivers/iio/imu/adis16480.c > @@ -1102,12 +1102,12 @@ static int adis16480_config_irq_pin(struct device_node *of_node, > /* > * Get the interrupt line behaviour. The data ready polarity can be > * configured as positive or negative, corresponding to > - * IRQF_TRIGGER_RISING or IRQF_TRIGGER_FALLING respectively. > + * IRQ_TYPE_EDGE_RISING or IRQ_TYPE_EDGE_FALLING respectively. > */ > irq_type = irqd_get_trigger_type(desc); > - if (irq_type == IRQF_TRIGGER_RISING) { /* Default */ > + if (irq_type == IRQ_TYPE_EDGE_RISING) { /* Default */ > val |= ADIS16480_DRDY_POL(1); > - } else if (irq_type == IRQF_TRIGGER_FALLING) { > + } else if (irq_type == IRQ_TYPE_EDGE_FALLING) { > val |= ADIS16480_DRDY_POL(0); > } else { > dev_err(&st->adis.spi->dev,
diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c index 5163749f568e..1eb4f98076f1 100644 --- a/drivers/iio/imu/adis16480.c +++ b/drivers/iio/imu/adis16480.c @@ -1102,12 +1102,12 @@ static int adis16480_config_irq_pin(struct device_node *of_node, /* * Get the interrupt line behaviour. The data ready polarity can be * configured as positive or negative, corresponding to - * IRQF_TRIGGER_RISING or IRQF_TRIGGER_FALLING respectively. + * IRQ_TYPE_EDGE_RISING or IRQ_TYPE_EDGE_FALLING respectively. */ irq_type = irqd_get_trigger_type(desc); - if (irq_type == IRQF_TRIGGER_RISING) { /* Default */ + if (irq_type == IRQ_TYPE_EDGE_RISING) { /* Default */ val |= ADIS16480_DRDY_POL(1); - } else if (irq_type == IRQF_TRIGGER_FALLING) { + } else if (irq_type == IRQ_TYPE_EDGE_FALLING) { val |= ADIS16480_DRDY_POL(0); } else { dev_err(&st->adis.spi->dev,
The value retrieved by `irqd_get_trigger_type()` is not an irq flag. While the values are the same, the meaning is different. Signed-off-by: Nuno Sá <nuno.sa@analog.com> --- drivers/iio/imu/adis16480.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)