iio: Remove single use of macro definition for IRQ name

There is really no reason for having the IRQ name as a macro definition
if it is only used once (often in functions requesting the IRQ). It
is also more readable this way. Remove these macro definitions and
instead use the string literal directly.

Signed-off-by: Waqar Hameed <waqar.hameed@axis.com>
Link: https://patch.msgid.link/3dc06cb2a83d292c50d9758643aad37ca5c6d95c.1748356671.git.waqar.hameed@axis.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c
index 744a034bb8b5f27a9184e33db5c90ebcd3e08fbe..546839d386a9afd972ed6ddf9f488263958a28c8 100644 (file)
--- a/drivers/iio/accel/bmc150-accel-core.c
+++ b/drivers/iio/accel/bmc150-accel-core.c
@@ -26,7 +26,6 @@
 #include "bmc150-accel.h"
 
 #define BMC150_ACCEL_DRV_NAME                  "bmc150_accel"
-#define BMC150_ACCEL_IRQ_NAME                  "bmc150_accel_event"
 
 #define BMC150_ACCEL_REG_CHIP_ID               0x00
 
@@ -1706,7 +1705,7 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
                                                bmc150_accel_irq_handler,
                                                bmc150_accel_irq_thread_handler,
                                                IRQF_TRIGGER_RISING,
-                                               BMC150_ACCEL_IRQ_NAME,
+                                               "bmc150_accel_event",
                                                indio_dev);
                if (ret)
                        goto err_buffer_cleanup;

diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index 18e4272877131e3b2cc8bb082026d7fe00722588..6aefe8221296c8f8baa3c6bebd9717e652266482 100644 (file)
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -26,8 +26,6 @@
 #include <linux/iio/triggered_buffer.h>
 #include <linux/iio/accel/kxcjk_1013.h>
 
-#define KXCJK1013_IRQ_NAME "kxcjk1013_event"
-
 #define KXTF9_REG_HP_XOUT_L            0x00
 #define KXTF9_REG_HP_XOUT_H            0x01
 #define KXTF9_REG_HP_YOUT_L            0x02
@@ -1463,7 +1461,7 @@ static int kxcjk1013_probe(struct i2c_client *client)
                                                kxcjk1013_data_rdy_trig_poll,
                                                kxcjk1013_event_handler,
                                                IRQF_TRIGGER_RISING,
-                                               KXCJK1013_IRQ_NAME,
+                                               "kxcjk1013_event",
                                                indio_dev);
                if (ret)
                        goto err_poweroff;

diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c
index e23383f5d4268fee0155596faf880b4fe44ae82c..02195deada49e56d9d33790f41c8a6ac2dacb1fc 100644 (file)
--- a/drivers/iio/accel/mma9551.c
+++ b/drivers/iio/accel/mma9551.c
@@ -17,7 +17,6 @@
 #include <linux/pm_runtime.h>
 #include "mma9551_core.h"
 
-#define MMA9551_IRQ_NAME               "mma9551_event"
 #define MMA9551_GPIO_COUNT             4
 
 /* Tilt application (inclination in IIO terms). */
@@ -421,7 +420,7 @@ static int mma9551_gpio_probe(struct iio_dev *indio_dev)
                ret = devm_request_threaded_irq(dev, data->irqs[i],
                                NULL, mma9551_event_handler,
                                IRQF_TRIGGER_RISING | IRQF_ONESHOT,
-                               MMA9551_IRQ_NAME, indio_dev);
+                               "mma9551_event", indio_dev);
                if (ret < 0) {
                        dev_err(dev, "request irq %d failed\n", data->irqs[i]);
                        return ret;

diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c
index 8dd26fb586ebaf1b1e08554c5d00f6c2c481d828..ffb0d6ff37124e5f364168c5c4f348a02d28842a 100644 (file)
--- a/drivers/iio/accel/mma9553.c
+++ b/drivers/iio/accel/mma9553.c
@@ -15,8 +15,6 @@
 #include <linux/pm_runtime.h>
 #include "mma9551_core.h"
 
-#define MMA9553_IRQ_NAME                       "mma9553_event"
-
 /* Pedometer configuration registers (R/W) */
 #define MMA9553_REG_CONF_SLEEPMIN              0x00
 #define MMA9553_REG_CONF_SLEEPMAX              0x02
@@ -1101,7 +1099,7 @@ static int mma9553_probe(struct i2c_client *client)
                                                mma9553_irq_handler,
                                                mma9553_event_handler,
                                                IRQF_TRIGGER_RISING,
-                                               MMA9553_IRQ_NAME, indio_dev);
+                                               "mma9553_event", indio_dev);
                if (ret < 0) {
                        dev_err(&client->dev, "request irq %d failed\n",
                                client->irq);

diff --git a/drivers/iio/accel/mxc4005.c b/drivers/iio/accel/mxc4005.c
index 1075c8ce0e37e1821904ec4211f0977d38f371ef..7e048c4eadd79eba81992fd9c707dd4f90841170 100644 (file)
--- a/drivers/iio/accel/mxc4005.c
+++ b/drivers/iio/accel/mxc4005.c
@@ -19,7 +19,6 @@
 #include <linux/iio/trigger_consumer.h>
 
 #define MXC4005_DRV_NAME               "mxc4005"
-#define MXC4005_IRQ_NAME               "mxc4005_event"
 #define MXC4005_REGMAP_NAME            "mxc4005_regmap"
 
 #define MXC4005_REG_XOUT_UPPER         0x03
@@ -493,7 +492,7 @@ static int mxc4005_probe(struct i2c_client *client)
                                                NULL,
                                                IRQF_TRIGGER_FALLING |
                                                IRQF_ONESHOT,
-                                               MXC4005_IRQ_NAME,
+                                               "mxc4005_event",
                                                data->dready_trig);
                if (ret) {
                        dev_err(&client->dev,

diff --git a/drivers/iio/accel/stk8312.c b/drivers/iio/accel/stk8312.c
index dfac2e44191fa5af76c7045f4621eedd455e737d..89569ce221d7204c2e3c4fac6f987c9e8c899d8c 100644 (file)
--- a/drivers/iio/accel/stk8312.c
+++ b/drivers/iio/accel/stk8312.c
@@ -46,7 +46,6 @@
 #define STK8312_ALL_CHANNEL_SIZE       3
 
 #define STK8312_DRIVER_NAME            "stk8312"
-#define STK8312_IRQ_NAME               "stk8312_event"
 
 /*
  * The accelerometer has two measurement ranges:
@@ -543,7 +542,7 @@ static int stk8312_probe(struct i2c_client *client)
                                                NULL,
                                                IRQF_TRIGGER_RISING |
                                                IRQF_ONESHOT,
-                                               STK8312_IRQ_NAME,
+                                               "stk8312_event",
                                                indio_dev);
                if (ret < 0) {
                        dev_err(&client->dev, "request irq %d failed\n",

diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c
index 05d4fd540eb2d15aca2a7990e25b71b66f757b8a..c1d7e7dcb09befb871fe683c33a9e07dabca0f9e 100644 (file)
--- a/drivers/iio/accel/stk8ba50.c
+++ b/drivers/iio/accel/stk8ba50.c
@@ -42,7 +42,6 @@
 #define STK8BA50_ALL_CHANNEL_SIZE              6
 
 #define STK8BA50_DRIVER_NAME                   "stk8ba50"
-#define STK8BA50_IRQ_NAME                      "stk8ba50_event"
 
 #define STK8BA50_SCALE_AVAIL                   "0.0384 0.0767 0.1534 0.3069"
 
@@ -436,7 +435,7 @@ static int stk8ba50_probe(struct i2c_client *client)
                                                NULL,
                                                IRQF_TRIGGER_RISING |
                                                IRQF_ONESHOT,
-                                               STK8BA50_IRQ_NAME,
+                                               "stk8ba50_event",
                                                indio_dev);
                if (ret < 0) {
                        dev_err(&client->dev, "request irq %d failed\n",

diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c
index deb3c6459dde8b897cf47efb903f836e1eddf5cb..781d3e96645ffeda0391352a1f942efe09f21cd7 100644 (file)
--- a/drivers/iio/gyro/bmg160_core.c
+++ b/drivers/iio/gyro/bmg160_core.c
@@ -21,8 +21,6 @@
 #include <linux/regulator/consumer.h>
 #include "bmg160.h"
 
-#define BMG160_IRQ_NAME                "bmg160_event"
-
 #define BMG160_REG_CHIP_ID             0x00
 #define BMG160_CHIP_ID_VAL             0x0F
 
@@ -1099,7 +1097,7 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,
                                                bmg160_data_rdy_trig_poll,
                                                bmg160_event_handler,
                                                IRQF_TRIGGER_RISING,
-                                               BMG160_IRQ_NAME,
+                                               "bmg160_event",
                                                indio_dev);
                if (ret)
                        return ret;

diff --git a/drivers/iio/imu/kmx61.c b/drivers/iio/imu/kmx61.c
index 1b8e8d362cd47009035ab5e1bb435b00bb7474fd..55c82891e08c1866dffc881944c3826643887ffb 100644 (file)
--- a/drivers/iio/imu/kmx61.c
+++ b/drivers/iio/imu/kmx61.c
@@ -22,8 +22,6 @@
 #include <linux/iio/triggered_buffer.h>
 #include <linux/iio/trigger_consumer.h>
 
-#define KMX61_IRQ_NAME "kmx61_event"
-
 #define KMX61_REG_WHO_AM_I     0x00
 #define KMX61_REG_INS1         0x01
 #define KMX61_REG_INS2         0x02
@@ -1311,7 +1309,7 @@ static int kmx61_probe(struct i2c_client *client)
                                                kmx61_data_rdy_trig_poll,
                                                kmx61_event_handler,
                                                IRQF_TRIGGER_RISING,
-                                               KMX61_IRQ_NAME,
+                                               "kmx61_event",
                                                data);
                if (ret)
                        goto err_chip_uninit;

diff --git a/drivers/iio/light/apds9300.c b/drivers/iio/light/apds9300.c
index 938d76f7e3129cedf2f9b8a9d25cc2eebfb4a020..05ba2167506327e50d8bfaf947e072ac1de29472 100644 (file)
--- a/drivers/iio/light/apds9300.c
+++ b/drivers/iio/light/apds9300.c
@@ -17,7 +17,6 @@
 #include <linux/iio/events.h>
 
 #define APDS9300_DRV_NAME "apds9300"
-#define APDS9300_IRQ_NAME "apds9300_event"
 
 /* Command register bits */
 #define APDS9300_CMD   BIT(7) /* Select command register. Must write as 1 */
@@ -432,7 +431,7 @@ static int apds9300_probe(struct i2c_client *client)
                ret = devm_request_threaded_irq(&client->dev, client->irq,
                                NULL, apds9300_interrupt_handler,
                                IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                               APDS9300_IRQ_NAME, indio_dev);
+                               "apds9300_event", indio_dev);
                if (ret) {
                        dev_err(&client->dev, "irq request error %d\n", -ret);
                        goto err;

diff --git a/drivers/iio/light/rpr0521.c b/drivers/iio/light/rpr0521.c
index 92e7552f3e39222c93f0bc55e7cbb172fe185a9b..9fca376d17c070dac8787a2bba51ea50be190e8a 100644 (file)
--- a/drivers/iio/light/rpr0521.c
+++ b/drivers/iio/light/rpr0521.c
@@ -69,7 +69,6 @@
 #define RPR0521_DEFAULT_MEAS_TIME      0x06 /* ALS - 100ms, PXS - 100ms */
 
 #define RPR0521_DRV_NAME               "RPR0521"
-#define RPR0521_IRQ_NAME               "rpr0521_event"
 #define RPR0521_REGMAP_NAME            "rpr0521_regmap"
 
 #define RPR0521_SLEEP_DELAY_MS 2000
@@ -991,7 +990,7 @@ static int rpr0521_probe(struct i2c_client *client)
                ret = devm_request_threaded_irq(&client->dev, client->irq,
                        rpr0521_drdy_irq_handler, rpr0521_drdy_irq_thread,
                        IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                       RPR0521_IRQ_NAME, indio_dev);
+                       "rpr0521_event", indio_dev);
                if (ret < 0) {
                        dev_err(&client->dev, "request irq %d for trigger0 failed\n",
                                client->irq);

diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
index deada9ba47489eb723120d80931753adb8e26775..d52133d23abdfb3c0fb9643086e55a1d3ea5a143 100644 (file)
--- a/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@ -47,7 +47,6 @@
 
 #define STK3310_DRIVER_NAME                    "stk3310"
 #define STK3310_REGMAP_NAME                    "stk3310_regmap"
-#define STK3310_EVENT                          "stk3310_event"
 
 #define STK3310_SCALE_AVAILABLE                        "6.4 1.6 0.4 0.1"
 
@@ -643,7 +642,7 @@ static int stk3310_probe(struct i2c_client *client)
                                                stk3310_irq_event_handler,
                                                IRQF_TRIGGER_FALLING |
                                                IRQF_ONESHOT,
-                                               STK3310_EVENT, indio_dev);
+                                               "stk3310_event", indio_dev);
                if (ret < 0) {
                        dev_err(&client->dev, "request irq %d failed\n",
                                client->irq);

diff --git a/drivers/iio/light/vcnl4035.c b/drivers/iio/light/vcnl4035.c
index b2bede9d3daa621a602ac6bd9940fea21a8a5ee5..796677ebcdf72f0e8d10ffa03d0892a5daae5f71 100644 (file)
--- a/drivers/iio/light/vcnl4035.c
+++ b/drivers/iio/light/vcnl4035.c
@@ -23,7 +23,6 @@
 #include <linux/iio/triggered_buffer.h>
 
 #define VCNL4035_DRV_NAME      "vcnl4035"
-#define VCNL4035_IRQ_NAME      "vcnl4035_event"
 #define VCNL4035_REGMAP_NAME   "vcnl4035_regmap"
 
 /* Device registers */
@@ -545,7 +544,7 @@ static int vcnl4035_probe_trigger(struct iio_dev *indio_dev)
        ret = devm_request_threaded_irq(&data->client->dev, data->client->irq,
                        NULL, vcnl4035_drdy_irq_thread,
                        IRQF_TRIGGER_LOW | IRQF_ONESHOT,
-                       VCNL4035_IRQ_NAME, indio_dev);
+                       "vcnl4035_event", indio_dev);
        if (ret < 0)
                dev_err(&data->client->dev, "request irq %d for trigger0 failed\n",
                                data->client->irq);

diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c
index f9c51ceae0110b8def19b5f421d09a9bb00fa5b6..40bb2a481ae72fe2c48a0d73e8b3faccc40f0b21 100644 (file)
--- a/drivers/iio/magnetometer/bmc150_magn.c
+++ b/drivers/iio/magnetometer/bmc150_magn.c
@@ -29,7 +29,6 @@
 #include "bmc150_magn.h"
 
 #define BMC150_MAGN_DRV_NAME                   "bmc150_magn"
-#define BMC150_MAGN_IRQ_NAME                   "bmc150_magn_event"
 
 #define BMC150_MAGN_REG_CHIP_ID                        0x40
 #define BMC150_MAGN_CHIP_ID_VAL                        0x32
@@ -918,7 +917,7 @@ int bmc150_magn_probe(struct device *dev, struct regmap *regmap,
                                           iio_trigger_generic_data_rdy_poll,
                                           NULL,
                                           IRQF_TRIGGER_RISING | IRQF_ONESHOT,
-                                          BMC150_MAGN_IRQ_NAME,
+                                          "bmc150_magn_event",
                                           data->dready_trig);
                if (ret < 0) {
                        dev_err(dev, "request irq %d failed\n", irq);

diff --git a/drivers/iio/proximity/sx9500.c b/drivers/iio/proximity/sx9500.c
index 8913da59dc731b0ecef4594ba8674766fde491ca..05844f17a15f6980ab7d55536e5fecfc5e4fe8c0 100644 (file)
--- a/drivers/iio/proximity/sx9500.c
+++ b/drivers/iio/proximity/sx9500.c
@@ -27,7 +27,6 @@
 #include <linux/iio/trigger_consumer.h>
 
 #define SX9500_DRIVER_NAME             "sx9500"
-#define SX9500_IRQ_NAME                        "sx9500_event"
 
 /* Register definitions. */
 #define SX9500_REG_IRQ_SRC             0x00
@@ -938,7 +937,7 @@ static int sx9500_probe(struct i2c_client *client)
                ret = devm_request_threaded_irq(&client->dev, client->irq,
                                sx9500_irq_handler, sx9500_irq_thread_handler,
                                IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                               SX9500_IRQ_NAME, indio_dev);
+                               "sx9500_event", indio_dev);
                if (ret < 0)
                        return ret;