| Message ID | 20240117-adis-improv-v1-3-7f90e9fad200@analog.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: imu: adis: misc fixes/improvements | expand |
On Wed, 17 Jan 2024 14:10:51 +0100 Nuno Sa <nuno.sa@analog.com> wrote: > There's no need to call both irq_get_irq_data() and > irqd_get_trigger_type() as we already have an helper for that. This > allows for code simplification. > > Signed-off-by: Nuno Sa <nuno.sa@analog.com> Applied 2 and 3 to the togreg branch of iio.git and pushed out as testing until I can rebase it on rc1. Thanks, Jonathan > --- > drivers/iio/imu/adis16480.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c > index fe520194a837..b40a55bba30c 100644 > --- a/drivers/iio/imu/adis16480.c > +++ b/drivers/iio/imu/adis16480.c > @@ -1246,18 +1246,11 @@ static int adis16480_config_irq_pin(struct adis16480 *st) > { > struct device *dev = &st->adis.spi->dev; > struct fwnode_handle *fwnode = dev_fwnode(dev); > - struct irq_data *desc; > enum adis16480_int_pin pin; > unsigned int irq_type; > uint16_t val; > int i, irq = 0; > > - desc = irq_get_irq_data(st->adis.spi->irq); > - if (!desc) { > - dev_err(dev, "Could not find IRQ %d\n", irq); > - return -EINVAL; > - } > - > /* Disable data ready since the default after reset is on */ > val = ADIS16480_DRDY_EN(0); > > @@ -1285,7 +1278,7 @@ static int adis16480_config_irq_pin(struct adis16480 *st) > * configured as positive or negative, corresponding to > * IRQ_TYPE_EDGE_RISING or IRQ_TYPE_EDGE_FALLING respectively. > */ > - irq_type = irqd_get_trigger_type(desc); > + irq_type = irq_get_trigger_type(st->adis.spi->irq); > if (irq_type == IRQ_TYPE_EDGE_RISING) { /* Default */ > val |= ADIS16480_DRDY_POL(1); > } else if (irq_type == IRQ_TYPE_EDGE_FALLING) { >
diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c index fe520194a837..b40a55bba30c 100644 --- a/drivers/iio/imu/adis16480.c +++ b/drivers/iio/imu/adis16480.c @@ -1246,18 +1246,11 @@ static int adis16480_config_irq_pin(struct adis16480 *st) { struct device *dev = &st->adis.spi->dev; struct fwnode_handle *fwnode = dev_fwnode(dev); - struct irq_data *desc; enum adis16480_int_pin pin; unsigned int irq_type; uint16_t val; int i, irq = 0; - desc = irq_get_irq_data(st->adis.spi->irq); - if (!desc) { - dev_err(dev, "Could not find IRQ %d\n", irq); - return -EINVAL; - } - /* Disable data ready since the default after reset is on */ val = ADIS16480_DRDY_EN(0); @@ -1285,7 +1278,7 @@ static int adis16480_config_irq_pin(struct adis16480 *st) * configured as positive or negative, corresponding to * IRQ_TYPE_EDGE_RISING or IRQ_TYPE_EDGE_FALLING respectively. */ - irq_type = irqd_get_trigger_type(desc); + irq_type = irq_get_trigger_type(st->adis.spi->irq); if (irq_type == IRQ_TYPE_EDGE_RISING) { /* Default */ val |= ADIS16480_DRDY_POL(1); } else if (irq_type == IRQ_TYPE_EDGE_FALLING) {
There's no need to call both irq_get_irq_data() and irqd_get_trigger_type() as we already have an helper for that. This allows for code simplification. Signed-off-by: Nuno Sa <nuno.sa@analog.com> --- drivers/iio/imu/adis16480.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)