[PATCH 06/12] iio: imu: use named initializers for acpi_device_id
From: Pawel Zalewski
Date: Mon Oct 05 2026 - 10:06:35 EST
Use a designated initializer for the acpi_device_id fields which makes the
code more readable and consistent with how lists are initialized in the
rest of the kernel code base. Also drop explicitly setting fields to 0
where it is redundant.
Signed-off-by: Pawel Zalewski <pzalewski@xxxxxxxxxxxxxxxxxxxx>
---
drivers/iio/imu/bmi160/bmi160_i2c.c | 6 +++---
drivers/iio/imu/bmi160/bmi160_spi.c | 4 ++--
drivers/iio/imu/bmi270/bmi270_i2c.c | 4 ++--
drivers/iio/imu/bmi323/bmi323_i2c.c | 2 +-
drivers/iio/imu/fxos8700_i2c.c | 2 +-
drivers/iio/imu/fxos8700_spi.c | 2 +-
drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 2 +-
drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 2 +-
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 4 ++--
drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/iio/imu/bmi160/bmi160_i2c.c b/drivers/iio/imu/bmi160/bmi160_i2c.c
index 3f3ee044a9cf..7a38f05a81fd 100644
--- a/drivers/iio/imu/bmi160/bmi160_i2c.c
+++ b/drivers/iio/imu/bmi160/bmi160_i2c.c
@@ -52,9 +52,9 @@ static const struct acpi_device_id bmi160_acpi_match[] = {
* this is not expected to change anymore since at least some of
* the affected devices are from 2021/2022.
*/
- {"10EC5280", 0},
- {"BMI0120", 0},
- {"BMI0160", 0},
+ { .id = "10EC5280" },
+ { .id = "BMI0120" },
+ { .id = "BMI0160" },
{ }
};
MODULE_DEVICE_TABLE(acpi, bmi160_acpi_match);
diff --git a/drivers/iio/imu/bmi160/bmi160_spi.c b/drivers/iio/imu/bmi160/bmi160_spi.c
index 107eb3374922..922909c8fa72 100644
--- a/drivers/iio/imu/bmi160/bmi160_spi.c
+++ b/drivers/iio/imu/bmi160/bmi160_spi.c
@@ -41,8 +41,8 @@ static const struct spi_device_id bmi160_spi_id[] = {
MODULE_DEVICE_TABLE(spi, bmi160_spi_id);
static const struct acpi_device_id bmi160_acpi_match[] = {
- {"BMI0120", 0},
- {"BMI0160", 0},
+ { .id = "BMI0120" },
+ { .id = "BMI0160" },
{ }
};
MODULE_DEVICE_TABLE(acpi, bmi160_acpi_match);
diff --git a/drivers/iio/imu/bmi270/bmi270_i2c.c b/drivers/iio/imu/bmi270/bmi270_i2c.c
index 7c035e82e6e9..1143c0061c81 100644
--- a/drivers/iio/imu/bmi270/bmi270_i2c.c
+++ b/drivers/iio/imu/bmi270/bmi270_i2c.c
@@ -40,9 +40,9 @@ MODULE_DEVICE_TABLE(i2c, bmi270_i2c_id);
static const struct acpi_device_id bmi270_acpi_match[] = {
/* GPD Win Mini, Aya Neo AIR Pro, OXP Mini Pro, etc. */
- { "BMI0160", (kernel_ulong_t)&bmi260_chip_info },
+ { .id = "BMI0160", .driver_data = (kernel_ulong_t)&bmi260_chip_info },
/* GPD Win Max 2 2023(sincice BIOS v0.40), etc. */
- { "BMI0260", (kernel_ulong_t)&bmi260_chip_info },
+ { .id = "BMI0260", .driver_data = (kernel_ulong_t)&bmi260_chip_info },
{ }
};
MODULE_DEVICE_TABLE(acpi, bmi270_acpi_match);
diff --git a/drivers/iio/imu/bmi323/bmi323_i2c.c b/drivers/iio/imu/bmi323/bmi323_i2c.c
index e835b91ea6b4..e025c88c30b4 100644
--- a/drivers/iio/imu/bmi323/bmi323_i2c.c
+++ b/drivers/iio/imu/bmi323/bmi323_i2c.c
@@ -107,7 +107,7 @@ static const struct acpi_device_id bmi323_acpi_match[] = {
* driver initialization. This device reset does occur in both the
* bmi323 and bmc150 init sequences.
*/
- { "BOSC0200" },
+ { .id = "BOSC0200" },
{ }
};
MODULE_DEVICE_TABLE(acpi, bmi323_acpi_match);
diff --git a/drivers/iio/imu/fxos8700_i2c.c b/drivers/iio/imu/fxos8700_i2c.c
index ba47e9260928..4441ddf01338 100644
--- a/drivers/iio/imu/fxos8700_i2c.c
+++ b/drivers/iio/imu/fxos8700_i2c.c
@@ -41,7 +41,7 @@ static const struct i2c_device_id fxos8700_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, fxos8700_i2c_id);
static const struct acpi_device_id fxos8700_acpi_match[] = {
- {"FXOS8700", 0},
+ { .id = "FXOS8700" },
{ }
};
MODULE_DEVICE_TABLE(acpi, fxos8700_acpi_match);
diff --git a/drivers/iio/imu/fxos8700_spi.c b/drivers/iio/imu/fxos8700_spi.c
index 56ad0c5914d9..2cd9cfcf867c 100644
--- a/drivers/iio/imu/fxos8700_spi.c
+++ b/drivers/iio/imu/fxos8700_spi.c
@@ -29,7 +29,7 @@ static const struct spi_device_id fxos8700_spi_id[] = {
MODULE_DEVICE_TABLE(spi, fxos8700_spi_id);
static const struct acpi_device_id fxos8700_acpi_match[] = {
- {"FXOS8700", 0},
+ { .id = "FXOS8700" },
{ }
};
MODULE_DEVICE_TABLE(acpi, fxos8700_acpi_match);
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
index 9ef6ab74af8b..8f00d6f04ac1 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
@@ -274,7 +274,7 @@ static const struct of_device_id inv_of_match[] = {
MODULE_DEVICE_TABLE(of, inv_of_match);
static const struct acpi_device_id inv_acpi_match[] = {
- {"INVN6500", INV_MPU6500},
+ { .id = "INVN6500", .driver_data = INV_MPU6500 },
{ }
};
MODULE_DEVICE_TABLE(acpi, inv_acpi_match);
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c
index 71e90ddc19dd..c6ad2e150290 100644
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c
@@ -161,7 +161,7 @@ static const struct of_device_id inv_of_match[] = {
MODULE_DEVICE_TABLE(of, inv_of_match);
static const struct acpi_device_id inv_acpi_match[] = {
- {"INVN6000", INV_MPU6000},
+ { .id = "INVN6000", .driver_data = INV_MPU6000 },
{ }
};
MODULE_DEVICE_TABLE(acpi, inv_acpi_match);
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
index edec898cb11f..c4097ce2bf81 100644
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
@@ -143,8 +143,8 @@ static const struct of_device_id st_lsm6dsx_i2c_of_match[] = {
MODULE_DEVICE_TABLE(of, st_lsm6dsx_i2c_of_match);
static const struct acpi_device_id st_lsm6dsx_i2c_acpi_match[] = {
- { "SMO8B30", ST_LSM6DS3TRC_ID, },
- { "SMOCF00", ST_LSM6DSO_ID, },
+ { .id = "SMO8B30", .driver_data = ST_LSM6DS3TRC_ID },
+ { .id = "SMOCF00", .driver_data = ST_LSM6DSO_ID },
{ }
};
MODULE_DEVICE_TABLE(acpi, st_lsm6dsx_i2c_acpi_match);
diff --git a/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c b/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c
index 6581d14e2bcf..a22ac4279503 100644
--- a/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c
+++ b/drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c
@@ -39,7 +39,7 @@ static const struct i2c_device_id st_lsm9ds0_id_table[] = {
MODULE_DEVICE_TABLE(i2c, st_lsm9ds0_id_table);
static const struct acpi_device_id st_lsm9ds0_acpi_match[] = {
- {"ACCL0001", (kernel_ulong_t)LSM303D_IMU_DEV_NAME},
+ { .id = "ACCL0001", .driver_data = (kernel_ulong_t)LSM303D_IMU_DEV_NAME },
{ }
};
MODULE_DEVICE_TABLE(acpi, st_lsm9ds0_acpi_match);
--
2.53.0