iio: Replace IRQF_ONESHOT with IRQF_NO_THREAD

Passing IRQF_ONESHOT ensures that the interrupt source is masked until
the secondary (threaded) handler is done. If only a primary handler is
used then the flag makes no sense because the interrupt can not fire
(again) while its handler is running.
The flag also disallows force-threading of the primary handler and the
irq-core will warn about this.

The intention here was probably not allowing forced-threading for
handlers such as iio_trigger_generic_data_rdy_poll() will intends to
invoke hard-interrupt handlers.

Replace IRQF_ONESHOT with IRQF_NO_THREAD.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Reviewed-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/adxl355_core.c b/drivers/iio/accel/adxl355_core.c
index 5fc7f814b907727269f4d4a8311974019f370954..1c1d64d5cbcb208a6e46fa9b00a7fe24a05d39d0 100644 (file)
--- a/drivers/iio/accel/adxl355_core.c
+++ b/drivers/iio/accel/adxl355_core.c
@@ -768,9 +768,8 @@ static int adxl355_probe_trigger(struct iio_dev *indio_dev, int irq)
        data->dready_trig->ops = &adxl355_trigger_ops;
        iio_trigger_set_drvdata(data->dready_trig, indio_dev);
 
-       ret = devm_request_irq(data->dev, irq,
-                              &iio_trigger_generic_data_rdy_poll,
-                              IRQF_ONESHOT, "adxl355_irq", data->dready_trig);
+       ret = devm_request_irq(data->dev, irq, &iio_trigger_generic_data_rdy_poll,
+                              IRQF_NO_THREAD, "adxl355_irq", data->dready_trig);
        if (ret)
                return dev_err_probe(data->dev, ret, "request irq %d failed\n",
                                     irq);

diff --git a/drivers/iio/accel/adxl372.c b/drivers/iio/accel/adxl372.c
index 46d518a2a029179bdd2cc2b9e98f09b6b9854fba..2f6aa52aeba51848c508f0ddaf54c5470fb8b0e1 100644 (file)
--- a/drivers/iio/accel/adxl372.c
+++ b/drivers/iio/accel/adxl372.c
@@ -1247,11 +1247,10 @@ int adxl372_probe(struct device *dev, struct regmap *regmap,
 
                indio_dev->trig = iio_trigger_get(st->dready_trig);
 
-               ret = devm_request_threaded_irq(dev, st->irq,
-                                       iio_trigger_generic_data_rdy_poll,
-                                       NULL,
-                                       IRQF_TRIGGER_RISING | IRQF_ONESHOT,
-                                       indio_dev->name, st->dready_trig);
+               ret = devm_request_irq(dev, st->irq,
+                                      iio_trigger_generic_data_rdy_poll,
+                                      IRQF_TRIGGER_RISING | IRQF_NO_THREAD,
+                                      indio_dev->name, st->dready_trig);
                if (ret < 0)
                        return ret;
        }

diff --git a/drivers/iio/accel/mxc4005.c b/drivers/iio/accel/mxc4005.c
index ac973d871c8bbb649dde3fd5cd54744ace5f6582..a2c3cf13d0981757d277254d347121ab1a0043d6 100644 (file)
--- a/drivers/iio/accel/mxc4005.c
+++ b/drivers/iio/accel/mxc4005.c
@@ -486,13 +486,10 @@ static int mxc4005_probe(struct i2c_client *client)
                if (!data->dready_trig)
                        return -ENOMEM;
 
-               ret = devm_request_threaded_irq(&client->dev, client->irq,
-                                               iio_trigger_generic_data_rdy_poll,
-                                               NULL,
-                                               IRQF_TRIGGER_FALLING |
-                                               IRQF_ONESHOT,
-                                               "mxc4005_event",
-                                               data->dready_trig);
+               ret = devm_request_irq(&client->dev, client->irq,
+                                      iio_trigger_generic_data_rdy_poll,
+                                      IRQF_TRIGGER_FALLING | IRQF_NO_THREAD,
+                                      "mxc4005_event", data->dready_trig);
                if (ret) {
                        dev_err(&client->dev,
                                "failed to init threaded irq\n");

diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c
index 384f1fbcbcb37db65a5b085f1985bb6e731b7279..a9ff2a273fe1cf50d14c580f5c2cc25ae56df9a9 100644 (file)
--- a/drivers/iio/accel/stk8ba50.c
+++ b/drivers/iio/accel/stk8ba50.c
@@ -428,13 +428,10 @@ static int stk8ba50_probe(struct i2c_client *client)
        }
 
        if (client->irq > 0) {
-               ret = devm_request_threaded_irq(&client->dev, client->irq,
-                                               stk8ba50_data_rdy_trig_poll,
-                                               NULL,
-                                               IRQF_TRIGGER_RISING |
-                                               IRQF_ONESHOT,
-                                               "stk8ba50_event",
-                                               indio_dev);
+               ret = devm_request_irq(&client->dev, client->irq,
+                                      stk8ba50_data_rdy_trig_poll,
+                                      IRQF_TRIGGER_RISING | IRQF_NO_THREAD,
+                                      "stk8ba50_event", indio_dev);
                if (ret < 0) {
                        dev_err(&client->dev, "request irq %d failed\n",
                                client->irq);

diff --git a/drivers/iio/adc/ad4170-4.c b/drivers/iio/adc/ad4170-4.c
index efaed92191f1b70b40c3983e09867928f4dfc6b2..82205bfae531ebff06351a976a169e117bc186b7 100644 (file)
--- a/drivers/iio/adc/ad4170-4.c
+++ b/drivers/iio/adc/ad4170-4.c
@@ -2973,7 +2973,7 @@ static int ad4170_probe(struct spi_device *spi)
 
        if (spi->irq) {
                ret = devm_request_irq(dev, spi->irq, &ad4170_irq_handler,
-                                      IRQF_ONESHOT, indio_dev->name, indio_dev);
+                                      IRQF_NO_THREAD, indio_dev->name, indio_dev);
                if (ret)
                        return ret;
 

diff --git a/drivers/iio/adc/ad7768-1.c b/drivers/iio/adc/ad7768-1.c
index 980c079ab41ae7ab08d902b84666ed24819d7389..fcd8aea7152e8caea8b79db69533b52670d839d0 100644 (file)
--- a/drivers/iio/adc/ad7768-1.c
+++ b/drivers/iio/adc/ad7768-1.c
@@ -1711,9 +1711,8 @@ static int ad7768_probe(struct spi_device *spi)
        if (ret)
                return ret;
 
-       ret = devm_request_irq(&spi->dev, spi->irq,
-                              &ad7768_interrupt,
-                              IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+       ret = devm_request_irq(&spi->dev, spi->irq, &ad7768_interrupt,
+                              IRQF_TRIGGER_RISING | IRQF_NO_THREAD,
                               indio_dev->name, indio_dev);
        if (ret)
                return ret;

diff --git a/drivers/iio/adc/ad7779.c b/drivers/iio/adc/ad7779.c
index aac5049c9a07b6fafdd4b3545a03d297d5823a2d..695cc79e78da532995df55dda43af7c7db0dc689 100644 (file)
--- a/drivers/iio/adc/ad7779.c
+++ b/drivers/iio/adc/ad7779.c
@@ -840,7 +840,7 @@ static int ad7779_setup_without_backend(struct ad7779_state *st, struct iio_dev
        iio_trigger_set_drvdata(st->trig, st);
 
        ret = devm_request_irq(dev, st->spi->irq, iio_trigger_generic_data_rdy_poll,
-                              IRQF_ONESHOT | IRQF_NO_AUTOEN, indio_dev->name,
+                              IRQF_NO_THREAD | IRQF_NO_AUTOEN, indio_dev->name,
                               st->trig);
        if (ret)
                return dev_err_probe(dev, ret, "request IRQ %d failed\n",

diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
index a6f21791c68591f67898a4165d90dc48a64b426e..ddc3721f3f68806d081e873d4c08a388e312322f 100644 (file)
--- a/drivers/iio/adc/mcp3911.c
+++ b/drivers/iio/adc/mcp3911.c
@@ -815,7 +815,7 @@ static int mcp3911_probe(struct spi_device *spi)
                 * don't enable the interrupt to avoid extra load on the system.
                 */
                ret = devm_request_irq(dev, spi->irq, &iio_trigger_generic_data_rdy_poll,
-                                      IRQF_NO_AUTOEN | IRQF_ONESHOT,
+                                      IRQF_NO_AUTOEN | IRQF_NO_THREAD,
                                       indio_dev->name, adc->trig);
                if (ret)
                        return ret;

diff --git a/drivers/iio/adc/ti-ads131e08.c b/drivers/iio/adc/ti-ads131e08.c
index c9a20024d6b11660b047687be4785d60eef8e6e9..a585621b0bc30ea428ed213191b7800322e381fa 100644 (file)
--- a/drivers/iio/adc/ti-ads131e08.c
+++ b/drivers/iio/adc/ti-ads131e08.c
@@ -827,7 +827,7 @@ static int ads131e08_probe(struct spi_device *spi)
        if (spi->irq) {
                ret = devm_request_irq(&spi->dev, spi->irq,
                        ads131e08_interrupt,
-                       IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                       IRQF_TRIGGER_FALLING | IRQF_NO_THREAD,
                        spi->dev.driver->name, indio_dev);
                if (ret)
                        return dev_err_probe(&spi->dev, ret,

diff --git a/drivers/iio/chemical/ens160_core.c b/drivers/iio/chemical/ens160_core.c
index 86bde4a91bf7ee20200bcfba31aab883a19d5d61..bbc96c4c6283800a5d5a4ed15c30870838734670 100644 (file)
--- a/drivers/iio/chemical/ens160_core.c
+++ b/drivers/iio/chemical/ens160_core.c
@@ -316,12 +316,9 @@ static int ens160_setup_trigger(struct iio_dev *indio_dev, int irq)
 
        indio_dev->trig = iio_trigger_get(trig);
 
-       ret = devm_request_threaded_irq(dev, irq,
-                                       iio_trigger_generic_data_rdy_poll,
-                                       NULL,
-                                       IRQF_ONESHOT,
-                                       indio_dev->name,
-                                       indio_dev->trig);
+       ret = devm_request_irq(dev, irq, iio_trigger_generic_data_rdy_poll,
+                              IRQF_NO_THREAD, indio_dev->name,
+                              indio_dev->trig);
        if (ret)
                return dev_err_probe(dev, ret, "failed to request irq\n");
 

diff --git a/drivers/iio/gyro/adxrs290.c b/drivers/iio/gyro/adxrs290.c
index 8fcb41f45baac5da6740b4b01c055c0c77a1b14f..3efe385ebedc4c3fd73bc6f121ee5fdc9a1e0b70 100644 (file)
--- a/drivers/iio/gyro/adxrs290.c
+++ b/drivers/iio/gyro/adxrs290.c
@@ -597,7 +597,7 @@ static int adxrs290_probe_trigger(struct iio_dev *indio_dev)
 
        ret = devm_request_irq(&st->spi->dev, st->spi->irq,
                               &iio_trigger_generic_data_rdy_poll,
-                              IRQF_ONESHOT, "adxrs290_irq", st->dready_trig);
+                              IRQF_NO_THREAD, "adxrs290_irq", st->dready_trig);
        if (ret < 0)
                return dev_err_probe(&st->spi->dev, ret,
                                     "request irq %d failed\n", st->spi->irq);

diff --git a/drivers/iio/health/afe4403.c b/drivers/iio/health/afe4403.c
index 0e5a512e3bb8f0f46a14a3c43ae21e532b5ba307..d358f4d5e5da8b3cdca2979f6415ecbee7f48ae7 100644 (file)
--- a/drivers/iio/health/afe4403.c
+++ b/drivers/iio/health/afe4403.c
@@ -540,11 +540,10 @@ static int afe4403_probe(struct spi_device *spi)
                        return ret;
                }
 
-               ret = devm_request_threaded_irq(dev, afe->irq,
-                                               iio_trigger_generic_data_rdy_poll,
-                                               NULL, IRQF_ONESHOT,
-                                               AFE4403_DRIVER_NAME,
-                                               afe->trig);
+               ret = devm_request_irq(dev, afe->irq,
+                                      iio_trigger_generic_data_rdy_poll,
+                                      IRQF_NO_THREAD, AFE4403_DRIVER_NAME,
+                                      afe->trig);
                if (ret) {
                        dev_err(dev, "Unable to request IRQ\n");
                        return ret;

diff --git a/drivers/iio/health/afe4404.c b/drivers/iio/health/afe4404.c
index 768d794e574b9af17de6f81bb037c54b1885f244..032da52a96d0ea5ad50917f4e780029479d599a5 100644 (file)
--- a/drivers/iio/health/afe4404.c
+++ b/drivers/iio/health/afe4404.c
@@ -547,11 +547,10 @@ static int afe4404_probe(struct i2c_client *client)
                        return ret;
                }
 
-               ret = devm_request_threaded_irq(dev, afe->irq,
-                                               iio_trigger_generic_data_rdy_poll,
-                                               NULL, IRQF_ONESHOT,
-                                               AFE4404_DRIVER_NAME,
-                                               afe->trig);
+               ret = devm_request_irq(dev, afe->irq,
+                                      iio_trigger_generic_data_rdy_poll,
+                                      IRQF_NO_THREAD, AFE4404_DRIVER_NAME,
+                                      afe->trig);
                if (ret) {
                        dev_err(dev, "Unable to request IRQ\n");
                        return ret;

diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c
index 6a73f6e2f1f069837fbf69b66c0a8a6768e691b0..a022e1805dff7e5ec6ef1ed93c268ac2dedf7a7d 100644 (file)
--- a/drivers/iio/magnetometer/bmc150_magn.c
+++ b/drivers/iio/magnetometer/bmc150_magn.c
@@ -906,12 +906,9 @@ int bmc150_magn_probe(struct device *dev, struct regmap *regmap,
                        goto err_poweroff;
                }
 
-               ret = request_threaded_irq(irq,
-                                          iio_trigger_generic_data_rdy_poll,
-                                          NULL,
-                                          IRQF_TRIGGER_RISING | IRQF_ONESHOT,
-                                          "bmc150_magn_event",
-                                          data->dready_trig);
+               ret = request_irq(irq, iio_trigger_generic_data_rdy_poll,
+                                 IRQF_TRIGGER_RISING | IRQF_NO_THREAD,
+                                 "bmc150_magn_event", data->dready_trig);
                if (ret < 0) {
                        dev_err(dev, "request irq %d failed\n", irq);
                        goto err_trigger_unregister;

diff --git a/drivers/iio/pressure/dlhl60d.c b/drivers/iio/pressure/dlhl60d.c
index 8bad7162fec64ba1eef45ae3fa944b45573318f4..46feb27fe632ff2ddacb088da8033477be85baa8 100644 (file)
--- a/drivers/iio/pressure/dlhl60d.c
+++ b/drivers/iio/pressure/dlhl60d.c
@@ -306,10 +306,9 @@ static int dlh_probe(struct i2c_client *client)
        indio_dev->num_channels = ARRAY_SIZE(dlh_channels);
 
        if (client->irq > 0) {
-               ret = devm_request_threaded_irq(&client->dev, client->irq,
-                       dlh_interrupt, NULL,
-                       IRQF_TRIGGER_RISING | IRQF_ONESHOT,
-                       st->info->name, indio_dev);
+               ret = devm_request_irq(&client->dev, client->irq, dlh_interrupt,
+                                      IRQF_TRIGGER_RISING | IRQF_NO_THREAD,
+                                      st->info->name, indio_dev);
                if (ret) {
                        dev_err(&client->dev, "failed to allocate threaded irq");
                        return ret;

diff --git a/drivers/iio/temperature/tmp006.c b/drivers/iio/temperature/tmp006.c
index 10bd3f221929d1b58b7e6a6bd9a75d5d068edf84..d8d8c8936d177f84318a5dbfc6a5a502a92e86cd 100644 (file)
--- a/drivers/iio/temperature/tmp006.c
+++ b/drivers/iio/temperature/tmp006.c
@@ -356,12 +356,10 @@ static int tmp006_probe(struct i2c_client *client)
 
                indio_dev->trig = iio_trigger_get(data->drdy_trig);
 
-               ret = devm_request_threaded_irq(&client->dev, client->irq,
-                                               iio_trigger_generic_data_rdy_poll,
-                                               NULL,
-                                               IRQF_ONESHOT,
-                                               "tmp006_irq",
-                                               data->drdy_trig);
+               ret = devm_request_irq(&client->dev, client->irq,
+                                      iio_trigger_generic_data_rdy_poll,
+                                      IRQF_NO_THREAD, "tmp006_irq",
+                                      data->drdy_trig);
                if (ret < 0)
                        return ret;
        }