On Tue, 8 Jun 2021 22:28:34 +0100 Jonathan Cameron <jic23@xxxxxxxxxx> wrote: > From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > > General driver churn doesn't always include updates of header includes. > Manual review of the output of the include-what-you-use checker lead to the > following cleanup. Hopefuly this brings things back to a good state for the > cros_ec sensor drivers. > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > Cc: Gwendal Grignou <gwendal@xxxxxxxxxxxx> > Cc: Guenter Roeck <groeck@xxxxxxxxxxxx> > Cc: Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx> I've sent a new version of this (at least partly because I'd forgotten I'd done it before and no reply to this since posting in June :( Anyhow, that version only deals with IIO headers so is smaller and easier to consider in isolation. If people prefer this one I'm happy as well. Thanks, Jonathan > --- > drivers/iio/accel/cros_ec_accel_legacy.c | 7 +------ > drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c | 8 ++------ > drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c | 7 ++----- > drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c | 6 ++++-- > drivers/iio/light/cros_ec_light_prox.c | 8 ++------ > drivers/iio/pressure/cros_ec_baro.c | 7 ++----- > 6 files changed, 13 insertions(+), 30 deletions(-) > > diff --git a/drivers/iio/accel/cros_ec_accel_legacy.c b/drivers/iio/accel/cros_ec_accel_legacy.c > index b6f3471b62dc..5b24b762b2dd 100644 > --- a/drivers/iio/accel/cros_ec_accel_legacy.c > +++ b/drivers/iio/accel/cros_ec_accel_legacy.c > @@ -9,17 +9,12 @@ > * Accelerometer access is presented through iio sysfs. > */ > > -#include <linux/delay.h> > #include <linux/device.h> > -#include <linux/iio/buffer.h> > #include <linux/iio/common/cros_ec_sensors_core.h> > #include <linux/iio/iio.h> > -#include <linux/iio/kfifo_buf.h> > -#include <linux/iio/trigger_consumer.h> > -#include <linux/iio/triggered_buffer.h> > #include <linux/kernel.h> > #include <linux/module.h> > -#include <linux/slab.h> > +#include <linux/mutex.h> > #include <linux/platform_data/cros_ec_commands.h> > #include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c b/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c > index af801e203623..497deaf9d96a 100644 > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c > +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c > @@ -10,20 +10,16 @@ > * iio sysfs. > */ > > -#include <linux/delay.h> > #include <linux/device.h> > -#include <linux/iio/buffer.h> > #include <linux/iio/common/cros_ec_sensors_core.h> > #include <linux/iio/iio.h> > -#include <linux/iio/kfifo_buf.h> > -#include <linux/iio/trigger.h> > #include <linux/iio/triggered_buffer.h> > -#include <linux/iio/trigger_consumer.h> > #include <linux/kernel.h> > #include <linux/module.h> > +#include <linux/mod_devicetable.h> > +#include <linux/mutex.h> > #include <linux/platform_data/cros_ec_commands.h> > #include <linux/platform_device.h> > -#include <linux/slab.h> > > #define DRV_NAME "cros-ec-lid-angle" > > diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c > index 376a5b30010a..de8b01501cc5 100644 > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c > +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c > @@ -9,18 +9,15 @@ > */ > > #include <linux/device.h> > -#include <linux/iio/buffer.h> > #include <linux/iio/common/cros_ec_sensors_core.h> > #include <linux/iio/iio.h> > -#include <linux/iio/kfifo_buf.h> > -#include <linux/iio/trigger_consumer.h> > -#include <linux/iio/triggered_buffer.h> > #include <linux/kernel.h> > #include <linux/module.h> > +#include <linux/mod_devicetable.h> > +#include <linux/mutex.h> > #include <linux/platform_data/cros_ec_commands.h> > #include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > -#include <linux/slab.h> > > #define CROS_EC_SENSORS_MAX_CHANNELS 4 > > diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > index 28bde13003b7..370d1017b533 100644 > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > @@ -12,12 +12,14 @@ > #include <linux/iio/iio.h> > #include <linux/iio/kfifo_buf.h> > #include <linux/iio/sysfs.h> > -#include <linux/iio/trigger.h> > #include <linux/iio/trigger_consumer.h> > #include <linux/iio/triggered_buffer.h> > +#include <linux/irqreturn.h> > #include <linux/kernel.h> > #include <linux/module.h> > -#include <linux/slab.h> > +#include <linux/mutex.h> > +#include <linux/pm.h> > +#include <linux/time.h> > #include <linux/platform_data/cros_ec_commands.h> > #include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_data/cros_ec_sensorhub.h> > diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c > index de472f23d1cb..062e02adac65 100644 > --- a/drivers/iio/light/cros_ec_light_prox.c > +++ b/drivers/iio/light/cros_ec_light_prox.c > @@ -6,19 +6,15 @@ > */ > > #include <linux/device.h> > -#include <linux/iio/buffer.h> > #include <linux/iio/common/cros_ec_sensors_core.h> > #include <linux/iio/iio.h> > -#include <linux/iio/kfifo_buf.h> > -#include <linux/iio/trigger.h> > -#include <linux/iio/triggered_buffer.h> > -#include <linux/iio/trigger_consumer.h> > #include <linux/kernel.h> > #include <linux/module.h> > +#include <linux/mod_devicetable.h> > +#include <linux/mutex.h> > #include <linux/platform_data/cros_ec_commands.h> > #include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h> > -#include <linux/slab.h> > > /* > * We only represent one entry for light or proximity. EC is merging different > diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c > index 2f882e109423..5a0d9dd1e78a 100644 > --- a/drivers/iio/pressure/cros_ec_baro.c > +++ b/drivers/iio/pressure/cros_ec_baro.c > @@ -6,16 +6,13 @@ > */ > > #include <linux/device.h> > -#include <linux/iio/buffer.h> > #include <linux/iio/common/cros_ec_sensors_core.h> > #include <linux/iio/iio.h> > -#include <linux/iio/kfifo_buf.h> > -#include <linux/iio/trigger.h> > -#include <linux/iio/triggered_buffer.h> > #include <linux/iio/trigger_consumer.h> > #include <linux/kernel.h> > #include <linux/module.h> > -#include <linux/slab.h> > +#include <linux/mod_devicetable.h> > +#include <linux/mutex.h> > #include <linux/platform_data/cros_ec_commands.h> > #include <linux/platform_data/cros_ec_proto.h> > #include <linux/platform_device.h>
