iio: st-sensors: Remove some unused includes and add some that should be there
Jonathan Cameron
maintainerPATCH 1/1 iio: st-sensors: Remove some unused includes and add some that should be there
From: Jonathan Cameron <[email protected]>
The st-sensors drivers have changed in structure over time, and includes have not always kept up with this. Let's bring them back to nearer the ideal.
Identified with the include-what-you-use tool and careful checking of its suggestions.
Note I haven't been particularly aggressive here, so this is just the cases where the include obviously isn't needed rather than the more subtle corners.
Note I took the opportunity to add mod_devicetable.h as I generally prefer to see that when acpi or of match tables are present.
--- drivers/iio/accel/st_accel_buffer.c | 7 +------ drivers/iio/accel/st_accel_core.c | 8 ++------ drivers/iio/accel/st_accel_i2c.c | 3 +-- drivers/iio/accel/st_accel_spi.c | 2 +- drivers/iio/common/st_sensors/st_sensors_buffer.c | 2 -- drivers/iio/common/st_sensors/st_sensors_core.c | 1 + drivers/iio/common/st_sensors/st_sensors_core.h | 1 + drivers/iio/common/st_sensors/st_sensors_i2c.c | 3 +-- drivers/iio/common/st_sensors/st_sensors_spi.c | 3 +-- drivers/iio/common/st_sensors/st_sensors_trigger.c | 1 - drivers/iio/gyro/st_gyro_buffer.c | 7 +------ drivers/iio/gyro/st_gyro_core.c | 9 ++------- drivers/iio/gyro/st_gyro_i2c.c | 2 +- drivers/iio/gyro/st_gyro_spi.c | 2 +- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 1 + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 3 ++- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 3 ++- drivers/iio/magnetometer/st_magn_buffer.c | 7 +------ drivers/iio/magnetometer/st_magn_core.c | 11 +++-------- drivers/iio/magnetometer/st_magn_i2c.c | 2 +- drivers/iio/magnetometer/st_magn_spi.c | 2 +- drivers/iio/pressure/st_pressure_buffer.c | 7 +------ drivers/iio/pressure/st_pressure_core.c | 10 ++-------- drivers/iio/pressure/st_pressure_i2c.c | 3 ++- drivers/iio/pressure/st_pressure_spi.c | 2 +- 25 files changed, 31 insertions(+), 71 deletions(-)
drivers/iio/accel/st_accel_buffer.c +1 -6
@@ -9,14 +9,9 @@#include <linux/module.h> #include <linux/kernel.h> -#include <linux/slab.h> -#include <linux/stat.h> -#include <linux/interrupt.h> -#include <linux/i2c.h> -#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/buffer.h> -#include <linux/iio/trigger_consumer.h> +#include <linux/iio/trigger.h> #include <linux/iio/triggered_buffer.h> #include <linux/iio/common/st_sensors.h>
drivers/iio/accel/st_accel_core.c +2 -6
@@ -9,17 +9,13 @@#include <linux/kernel.h> #include <linux/module.h> +#include <linux/mutex.h> +#include <linux/sysfs.h> #include <linux/slab.h> #include <linux/acpi.h> -#include <linux/errno.h> -#include <linux/types.h> -#include <linux/interrupt.h> -#include <linux/i2c.h> -#include <linux/irq.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> #include <linux/iio/trigger.h> -#include <linux/iio/buffer.h> #include <linux/iio/common/st_sensors.h> #include "st_accel.h"
drivers/iio/accel/st_accel_i2c.c +1 -2
@@ -9,11 +9,10 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> +#include <linux/mod_devicetable.h> #include <linux/acpi.h> #include <linux/i2c.h> #include <linux/iio/iio.h> -#include <linux/property.h> #include <linux/iio/common/st_sensors_i2c.h> #include "st_accel.h"
drivers/iio/accel/st_accel_spi.c +1 -1
@@ -9,7 +9,7 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> +#include <linux/mod_devicetable.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h>
drivers/iio/common/st_sensors/st_sensors_buffer.c +0 -2
@@ -9,13 +9,11 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> #include <linux/iio/iio.h> #include <linux/iio/trigger.h> #include <linux/interrupt.h> #include <linux/iio/buffer.h> #include <linux/iio/trigger_consumer.h> -#include <linux/iio/triggered_buffer.h> #include <linux/irqreturn.h> #include <linux/regmap.h>
drivers/iio/common/st_sensors/st_sensors_core.c +1 -0
@@ -12,6 +12,7 @@#include <linux/slab.h> #include <linux/delay.h> #include <linux/iio/iio.h> +#include <linux/mutex.h> #include <linux/property.h> #include <linux/regulator/consumer.h> #include <linux/regmap.h>
drivers/iio/common/st_sensors/st_sensors_core.h +1 -0
@@ -4,6 +4,7 @@*/ #ifndef __ST_SENSORS_CORE_H#define __ST_SENSORS_CORE_H +struct iio_dev ;int st_sensors_write_data_with_mask (struct iio_dev *indio_dev,u8 reg_addr,u8 mask,u8 data);#endif
drivers/iio/common/st_sensors/st_sensors_i2c.c +1 -2
@@ -7,15 +7,14 @@* Denis Ciocca <[email protected]> */ +#include <linux/i2c.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> #include <linux/iio/iio.h> #include <linux/regmap.h> #include <linux/iio/common/st_sensors_i2c.h> -#define ST_SENSORS_I2C_MULTIREAD 0x80static const struct regmap_config st_sensors_i2c_regmap_config = {
drivers/iio/common/st_sensors/st_sensors_spi.c +1 -2
@@ -9,13 +9,12 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> #include <linux/iio/iio.h> #include <linux/property.h> #include <linux/regmap.h> +#include <linux/spi/spi.h> #include <linux/iio/common/st_sensors_spi.h> -#include "st_sensors_core.h" #define ST_SENSORS_SPI_MULTIREAD 0xc0
drivers/iio/common/st_sensors/st_sensors_trigger.c +0 -1
@@ -9,7 +9,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> #include <linux/iio/iio.h> #include <linux/iio/trigger.h> #include <linux/interrupt.h>
drivers/iio/gyro/st_gyro_buffer.c +1 -6
@@ -9,14 +9,9 @@#include <linux/module.h> #include <linux/kernel.h> -#include <linux/slab.h> -#include <linux/stat.h> -#include <linux/interrupt.h> -#include <linux/i2c.h> -#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/buffer.h> -#include <linux/iio/trigger_consumer.h> +#include <linux/iio/trigger.h> #include <linux/iio/triggered_buffer.h> #include <linux/iio/common/st_sensors.h>
drivers/iio/gyro/st_gyro_core.c +2 -7
@@ -9,17 +9,12 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> -#include <linux/errno.h> -#include <linux/types.h> +#include <linux/mutex.h> #include <linux/interrupt.h> -#include <linux/i2c.h> -#include <linux/irq.h> -#include <linux/delay.h> +#include <linux/sysfs.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> #include <linux/iio/trigger.h> -#include <linux/iio/buffer.h> #include <linux/iio/common/st_sensors.h> #include "st_gyro.h"
drivers/iio/gyro/st_gyro_i2c.c +1 -1
@@ -9,7 +9,7 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> +#include <linux/mod_devicetable.h> #include <linux/i2c.h> #include <linux/iio/iio.h>
drivers/iio/gyro/st_gyro_spi.c +1 -1
@@ -9,7 +9,7 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> +#include <linux/mod_devicetable.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h>
drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c +1 -0
@@ -10,6 +10,7 @@#include <linux/device.h> #include <linux/err.h> #include <linux/module.h> +#include <linux/regmap.h> #include <linux/regulator/consumer.h> #include <linux/iio/common/st_sensors.h>
drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c +2 -1
@@ -10,7 +10,8 @@#include <linux/i2c.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> +#include <linux/mod_devicetable.h> +#include <linux/regmap.h> #include <linux/iio/common/st_sensors_i2c.h>
drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c +2 -1
@@ -9,7 +9,8 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> +#include <linux/mod_devicetable.h> +#include <linux/regmap.h> #include <linux/spi/spi.h> #include <linux/iio/common/st_sensors_spi.h>
drivers/iio/magnetometer/st_magn_buffer.c +1 -6
@@ -9,14 +9,9 @@#include <linux/module.h> #include <linux/kernel.h> -#include <linux/slab.h> -#include <linux/stat.h> -#include <linux/interrupt.h> -#include <linux/i2c.h> -#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/buffer.h> -#include <linux/iio/trigger_consumer.h> +#include <linux/iio/trigger.h> #include <linux/iio/triggered_buffer.h> #include <linux/iio/common/st_sensors.h>
drivers/iio/magnetometer/st_magn_core.c +3 -8
@@ -9,16 +9,11 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> -#include <linux/errno.h> -#include <linux/types.h> -#include <linux/interrupt.h> -#include <linux/i2c.h> -#include <linux/irq.h> -#include <linux/delay.h> +#include <linux/mutex.h> +#include <linux/sysfs.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/iio/buffer.h> +#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include "st_magn.h"
drivers/iio/magnetometer/st_magn_i2c.c +1 -1
@@ -9,7 +9,7 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> +#include <linux/mod_devicetable.h> #include <linux/i2c.h> #include <linux/iio/iio.h>
drivers/iio/magnetometer/st_magn_spi.c +1 -1
@@ -9,7 +9,7 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> +#include <linux/mod_devicetable.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h>
drivers/iio/pressure/st_pressure_buffer.c +1 -6
@@ -9,14 +9,9 @@#include <linux/module.h> #include <linux/kernel.h> -#include <linux/slab.h> -#include <linux/stat.h> -#include <linux/interrupt.h> -#include <linux/i2c.h> -#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/buffer.h> -#include <linux/iio/trigger_consumer.h> +#include <linux/iio/trigger.h> #include <linux/iio/triggered_buffer.h> #include <linux/iio/common/st_sensors.h>
drivers/iio/pressure/st_pressure_core.c +2 -8
@@ -9,17 +9,11 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> -#include <linux/errno.h> -#include <linux/types.h> -#include <linux/interrupt.h> -#include <linux/i2c.h> -#include <linux/irq.h> -#include <linux/delay.h> +#include <linux/mutex.h> +#include <linux/sysfs.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> #include <linux/iio/trigger.h> -#include <linux/iio/buffer.h> #include <asm/unaligned.h> #include <linux/iio/common/st_sensors.h>
drivers/iio/pressure/st_pressure_i2c.c +2 -1
@@ -7,9 +7,10 @@* Denis Ciocca <[email protected]> */ +#include <linux/acpi.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> +#include <linux/mod_devicetable.h> #include <linux/i2c.h> #include <linux/iio/iio.h>
drivers/iio/pressure/st_pressure_spi.c +1 -1
@@ -9,7 +9,7 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/slab.h> +#include <linux/mod_devicetable.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h>
Signature · 1 line
2.31.1
Quoted 13 lines · Jonathan Cameron
From: Jonathan Cameron <[email protected]>
The st-sensors drivers have changed in structure over time, and includes have not always kept up with this. Let's bring them back to nearer the ideal.
Identified with the include-what-you-use tool and careful checking of its suggestions.
Note I haven't been particularly aggressive here, so this is just the cases where the include obviously isn't needed rather than the more subtle corners.
Quoted 7 lines
Note I took the opportunity to add
mod_devicetable.has I generally prefer to see that when acpi or of match tables are present.Signed-off-by Jonathan Cameron <[email protected]>Cc Linus Walleij <[email protected]>Cc Denis Ciocca <[email protected]>Cc Hans de Goede <[email protected]>
Looks good to me.
Yours,
Linus Walleij
Jonathan Cameron
maintainerQuoted 23 lines · On Wed, 9 Jun 2021 09:53:57 +0200 Linus Walleij <[email protected]>…
Quoted 13 lines · Jonathan Cameron
From: Jonathan Cameron <[email protected]>
The st-sensors drivers have changed in structure over time, and includes have not always kept up with this. Let's bring them back to nearer the ideal.
Identified with the include-what-you-use tool and careful checking of its suggestions.
Note I haven't been particularly aggressive here, so this is just the cases where the include obviously isn't needed rather than the more subtle corners.
Quoted 7 lines
Note I took the opportunity to add
mod_devicetable.has I generally prefer to see that when acpi or of match tables are present.Signed-off-by Jonathan Cameron <[email protected]>Cc Linus Walleij <[email protected]>Cc Denis Ciocca <[email protected]>Cc Hans de Goede <[email protected]>
Quoted 5 lines
Looks good to me.
Acked-by Linus Walleij <[email protected]>Yours,
Linus Walleij
This seems unaffected by the questions around kernel.h and the splitting that Andy is working on for that. Hence applied to the togreg branch of iio.git and pushed out as testing to see if 0-day can find anything I missed.
Thanks,
Jonathan