iio: st_sensors: convert probe functions to full devm
v2 cover iio: st_sensors: convert probe functions to full devm
Changelog v1 - v2:
* https://lore.kernel.org/linux-iio/[email protected]/
* added patch 'iio: st_sensors: disable regulators after device unregistration'
- splits the regulator disable fix in a separate patch
Alexandru Ardelean (5):
iio: st_sensors: disable regulators after device unregistration
iio: st_sensors: remove st_sensors_deallocate_trigger() function
iio: st_sensors: remove st_sensors_power_disable() function
iio: st_sensors: remove all driver remove functions
iio: st_sensors: remove reference to parent device object on
st_sensor_data
drivers/iio/accel/st_accel_core.c | 32 +++-------- drivers/iio/accel/st_accel_i2c.c | 23 +------- drivers/iio/accel/st_accel_spi.c | 23 +------- .../iio/common/st_sensors/st_sensors_core.c | 34 ++++++------ .../iio/common/st_sensors/st_sensors_i2c.c | 1 - .../iio/common/st_sensors/st_sensors_spi.c | 1 - .../common/st_sensors/st_sensors_trigger.c | 53 +++++++------------ drivers/iio/gyro/st_gyro_core.c | 27 ++-------- drivers/iio/gyro/st_gyro_i2c.c | 23 +------- drivers/iio/gyro/st_gyro_spi.c | 23 +------- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 1 - drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 17 +----- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 6 --- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 6 --- drivers/iio/magnetometer/st_magn_core.c | 29 ++-------- drivers/iio/magnetometer/st_magn_i2c.c | 23 +------- drivers/iio/magnetometer/st_magn_spi.c | 23 +------- drivers/iio/pressure/st_pressure_core.c | 27 ++-------- drivers/iio/pressure/st_pressure_i2c.c | 23 +------- drivers/iio/pressure/st_pressure_spi.c | 23 +------- include/linux/iio/common/st_sensors.h | 13 ----- 21 files changed, 60 insertions(+), 371 deletions(-)
Signature · 1 line
2.31.1
PATCH v2 1/5 iio: st_sensors: disable regulators after device unregistration
Up until commit ea7e586bdd331 ("iio: st_sensors: move regulator retrieveal to core") only the ST pressure driver seems to have had any regulator disable. After that commit, the regulator handling was moved into the common st_sensors logic.
In all instances of this regulator handling, the regulators were disabled before unregistering the IIO device.
This can cause issues where the device would be powered down and still be available to userspace, allowing it to send invalid/garbage data.
This change moves the st_sensors_power_disable() after the common probe functions. These common probe functions also handle unregistering the IIO device.
--- drivers/iio/accel/st_accel_i2c.c | 4 ++-- drivers/iio/accel/st_accel_spi.c | 4 ++-- drivers/iio/gyro/st_gyro_i2c.c | 4 ++-- drivers/iio/gyro/st_gyro_spi.c | 4 ++-- drivers/iio/magnetometer/st_magn_i2c.c | 4 ++-- drivers/iio/magnetometer/st_magn_spi.c | 4 ++-- drivers/iio/pressure/st_pressure_i2c.c | 4 ++-- drivers/iio/pressure/st_pressure_spi.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-)
drivers/iio/accel/st_accel_i2c.c +2 -2
@@ -193,10 +193,10 @@ static int st_accel_i2c_remove(struct i2c_client *client) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/accel/st_accel_spi.c +2 -2
@@ -143,10 +143,10 @@ static int st_accel_spi_remove(struct spi_device *spi) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/gyro/st_gyro_i2c.c +2 -2
@@ -106,10 +106,10 @@ static int st_gyro_i2c_remove(struct i2c_client *client) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/gyro/st_gyro_spi.c +2 -2
@@ -110,10 +110,10 @@ static int st_gyro_spi_remove(struct spi_device *spi) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/magnetometer/st_magn_i2c.c +2 -2
@@ -102,10 +102,10 @@ static int st_magn_i2c_remove(struct i2c_client *client) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/magnetometer/st_magn_spi.c +2 -2
@@ -96,10 +96,10 @@ static int st_magn_spi_remove(struct spi_device *spi) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/pressure/st_pressure_i2c.c +2 -2
@@ -119,10 +119,10 @@ static int st_press_i2c_remove(struct i2c_client *client) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_press_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
drivers/iio/pressure/st_pressure_spi.c +2 -2
@@ -102,10 +102,10 @@ static int st_press_spi_remove(struct spi_device *spi) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_press_common_remove (indio_dev); +st_sensors_power_disable (indio_dev); +return 0 ; }
Signature · 1 line
2.31.1
Re: [PATCH v2 1/5] iio: st_sensors: disable regulators after device unregistration
Quoted 14 lines · Alexandru Ardelean
Up until commit
ea7e586bdd331("iio:st_sensors: move regulator retrieveal to core") only the ST pressure driver seems to have had any regulator disable. After that commit, the regulator handling was moved into the commonst_sensorslogic.In all instances of this regulator handling, the regulators were disabled before unregistering the IIO device.
This can cause issues where the device would be powered down and still be available to userspace, allowing it to send invalid/garbage data.This change moves the
st_sensors_power_disable()after the common probe functions. These common probe functions also handle unregistering the IIO device.
Quoted 7 lines
Fixes 774487611c949 ("iio: pressure-core: st: Provide support for the Vdd power supply")Fixes ea7e586bdd331 ("iio: st_sensors: move regulator retrieveal to core")Cc Lee Jones <[email protected]>Cc Denis CIOCCA <[email protected]>Cc Linus Walleij <[email protected]>Cc Andy Shevchenko <[email protected]>Signed-off-by Alexandru Ardelean <[email protected]>
That's a valid concern I suppose:
But as it now occurs last before return 0, can't we just solve this with adevm_add_action_or_reset(dev, st_sensors_power_off_action, *); of some kind and let devres handle it?
c.fdrivers/input/touchscreen/cy8ctma140.c
Yours,
Linus Walleij
Re: [PATCH v2 1/5] iio: st_sensors: disable regulators after device unregistration
Quoted 26 lines · Linus Walleij
Quoted 14 lines · Alexandru Ardelean
Up until commit
ea7e586bdd331("iio:st_sensors: move regulator retrieveal to core") only the ST pressure driver seems to have had any regulator disable. After that commit, the regulator handling was moved into the commonst_sensorslogic.In all instances of this regulator handling, the regulators were disabled before unregistering the IIO device.
This can cause issues where the device would be powered down and still be available to userspace, allowing it to send invalid/garbage data.This change moves the
st_sensors_power_disable()after the common probe functions. These common probe functions also handle unregistering the IIO device.Quoted 7 lines
Fixes 774487611c949 ("iio: pressure-core: st: Provide support for the Vdd power supply")Fixes ea7e586bdd331 ("iio: st_sensors: move regulator retrieveal to core")Cc Lee Jones <[email protected]>Cc Denis CIOCCA <[email protected]>Cc Linus Walleij <[email protected]>Cc Andy Shevchenko <[email protected]>Signed-off-by Alexandru Ardelean <[email protected]>
Quoted 7 lines
That's a valid concern I suppose:
Reviewed-by Linus Walleij <[email protected]>But as it now occurs last before return 0, can't we just solve this with a
devm_add_action_or_reset(dev, st_sensors_power_off_action, *); of some kind and let devres handle it?
i think this is my fault for not CC-ing the entire series to you:
https://patchwork.kernel.org/project/linux-iio/list/?series=531879
this is part of a larger conversion to devm_ for ST sensors;
i was hoping that if i CC you on one patch, then git send-email would CC you on the entire set;
doesn't seem to be the case;
i'll try to remember that on the next sets;
[but maybe having this written here, will help me remember]
Quoted 6 lines
c.f
drivers/input/touchscreen/cy8ctma140.cYours,
Linus Walleij
PATCH v2 2/5 iio: st_sensors: remove st_sensors_deallocate_trigger() function
In reply to Alexandru ArdeleanThis change converts the st_sensors_allocate_trigger() to use device-managed functions.
The parent device of the IIO device object is used. This is based on the assumption that all other devm_ calls in the ST sensors use this reference.
That makes the st_sensors_deallocate_trigger() function un-needed, so it can be removed.
--- drivers/iio/accel/st_accel_core.c | 18 +------- .../common/st_sensors/st_sensors_trigger.c | 45 +++++++------------ drivers/iio/gyro/st_gyro_core.c | 18 +------- drivers/iio/magnetometer/st_magn_core.c | 18 +------- drivers/iio/pressure/st_pressure_core.c | 18 +------- include/linux/iio/common/st_sensors.h | 5 --- 6 files changed, 19 insertions(+), 103 deletions(-)
drivers/iio/accel/st_accel_core.c +1 -17
@@ -1380,29 +1380,13 @@ int st_accel_common_probe(struct iio_dev *indio_dev)return err; } - err =iio_device_register (indio_dev); -if (err) - goto st_accel_device_register_error; - -dev_info (&indio_dev->dev,"registered accelerometer %s\n" , - indio_dev->name); - -return 0 ; - -st_accel_device_register_error: -if (adata->irq >0 ) -st_sensors_deallocate_trigger (indio_dev); -return err; +return iio_device_register (indio_dev); }EXPORT_SYMBOL (st_accel_common_probe);void st_accel_common_remove (struct iio_dev *indio_dev) { -struct st_sensor_data *adata =iio_priv (indio_dev); -iio_device_unregister (indio_dev); -if (adata->irq >0 ) -st_sensors_deallocate_trigger (indio_dev); }EXPORT_SYMBOL (st_accel_common_remove);
drivers/iio/common/st_sensors/st_sensors_trigger.c +15 -30
85 lines not on this page · raw message
drivers/iio/gyro/st_gyro_core.c +1 -17
@@ -515,29 +515,13 @@ int st_gyro_common_probe(struct iio_dev *indio_dev)return err; } - err =iio_device_register (indio_dev); -if (err) - goto st_gyro_device_register_error; - -dev_info (&indio_dev->dev,"registered gyroscope %s\n" , - indio_dev->name); - -return 0 ; - -st_gyro_device_register_error: -if (gdata->irq >0 ) -st_sensors_deallocate_trigger (indio_dev); -return err; +return iio_device_register (indio_dev); }EXPORT_SYMBOL (st_gyro_common_probe);void st_gyro_common_remove (struct iio_dev *indio_dev) { -struct st_sensor_data *gdata =iio_priv (indio_dev); -iio_device_unregister (indio_dev); -if (gdata->irq >0 ) -st_sensors_deallocate_trigger (indio_dev); }EXPORT_SYMBOL (st_gyro_common_remove);
drivers/iio/magnetometer/st_magn_core.c +1 -17
@@ -650,29 +650,13 @@ int st_magn_common_probe(struct iio_dev *indio_dev)return err; } - err =iio_device_register (indio_dev); -if (err) - goto st_magn_device_register_error; - -dev_info (&indio_dev->dev,"registered magnetometer %s\n" , - indio_dev->name); - -return 0 ; - -st_magn_device_register_error: -if (mdata->irq >0 ) -st_sensors_deallocate_trigger (indio_dev); -return err; +return iio_device_register (indio_dev); }EXPORT_SYMBOL (st_magn_common_probe);void st_magn_common_remove (struct iio_dev *indio_dev) { -struct st_sensor_data *mdata =iio_priv (indio_dev); -iio_device_unregister (indio_dev); -if (mdata->irq >0 ) -st_sensors_deallocate_trigger (indio_dev); }EXPORT_SYMBOL (st_magn_common_remove);
drivers/iio/pressure/st_pressure_core.c +1 -17
@@ -721,29 +721,13 @@ int st_press_common_probe(struct iio_dev *indio_dev)return err; } - err =iio_device_register (indio_dev); -if (err) - goto st_press_device_register_error; - -dev_info (&indio_dev->dev,"registered pressure sensor %s\n" , - indio_dev->name); - -return err; - -st_press_device_register_error: -if (press_data->irq >0 ) -st_sensors_deallocate_trigger (indio_dev); -return err; +return iio_device_register (indio_dev); }EXPORT_SYMBOL (st_press_common_probe);void st_press_common_remove (struct iio_dev *indio_dev) { -struct st_sensor_data *press_data =iio_priv (indio_dev); -iio_device_unregister (indio_dev); -if (press_data->irq >0 ) -st_sensors_deallocate_trigger (indio_dev); }EXPORT_SYMBOL (st_press_common_remove);
include/linux/iio/common/st_sensors.h +0 -5
@@ -273,7 +273,6 @@ irqreturn_t st_sensors_trigger_handler(int irq, void *p);int st_sensors_allocate_trigger (struct iio_dev *indio_dev,const struct iio_trigger_ops *trigger_ops); -void st_sensors_deallocate_trigger (struct iio_dev *indio_dev);int st_sensors_validate_device (struct iio_trigger *trig,struct iio_dev *indio_dev);#else
@@ -282,10 +281,6 @@ static inline int st_sensors_allocate_trigger(struct iio_dev *indio_dev, {return 0 ; } -static inline void st_sensors_deallocate_trigger (struct iio_dev *indio_dev) -{ -return ; -}#define st_sensors_validate_device NULL#endif
Signature · 1 line
2.31.1
PATCH v2 3/5 iio: st_sensors: remove st_sensors_power_disable() function
In reply to Alexandru ArdeleanThis change converts the st_sensors_power_enable() function to use devm_add_action_or_reset() handlers to register regulator_disable hooks for when the drivers get unloaded.
The parent device of the IIO device object is used. This is based on the assumption that all other devm_ calls in the ST sensors use this reference.
This makes the st_sensors_power_disable() un-needed.
Removing this also changes unload order a bit, as all ST drivers would call st_sensors_power_disable() first and iio_device_unregister() after that.
--- drivers/iio/accel/st_accel_i2c.c | 13 +------ drivers/iio/accel/st_accel_spi.c | 13 +------ .../iio/common/st_sensors/st_sensors_core.c | 34 ++++++++----------- drivers/iio/gyro/st_gyro_i2c.c | 13 +------ drivers/iio/gyro/st_gyro_spi.c | 13 +------ drivers/iio/magnetometer/st_magn_i2c.c | 13 +------ drivers/iio/magnetometer/st_magn_spi.c | 13 +------ drivers/iio/pressure/st_pressure_i2c.c | 13 +------ drivers/iio/pressure/st_pressure_spi.c | 13 +------ include/linux/iio/common/st_sensors.h | 2 -- 10 files changed, 23 insertions(+), 117 deletions(-)
drivers/iio/accel/st_accel_i2c.c +1 -12
@@ -177,16 +177,7 @@ static int st_accel_i2c_probe(struct i2c_client *client)if (ret)return ret; - ret =st_accel_common_probe (indio_dev); -if (ret <0 ) - goto st_accel_power_off; - -return 0 ; - -st_accel_power_off: -st_sensors_power_disable (indio_dev); - -return ret; +return st_accel_common_probe (indio_dev); }static int st_accel_i2c_remove (struct i2c_client *client)
@@ -195,8 +186,6 @@ static int st_accel_i2c_remove(struct i2c_client *client)st_accel_common_remove (indio_dev); -st_sensors_power_disable (indio_dev); -return 0 ; }
drivers/iio/accel/st_accel_spi.c +1 -12
@@ -127,16 +127,7 @@ static int st_accel_spi_probe(struct spi_device *spi)if (err)return err; - err =st_accel_common_probe (indio_dev); -if (err <0 ) - goto st_accel_power_off; - -return 0 ; - -st_accel_power_off: -st_sensors_power_disable (indio_dev); - -return err; +return st_accel_common_probe (indio_dev); }static int st_accel_spi_remove (struct spi_device *spi)
@@ -145,8 +136,6 @@ static int st_accel_spi_remove(struct spi_device *spi)st_accel_common_remove (indio_dev); -st_sensors_power_disable (indio_dev); -return 0 ; }
drivers/iio/common/st_sensors/st_sensors_core.c +15 -19
@@ -215,13 +215,19 @@ int st_sensors_set_axis_enable(struct iio_dev *indio_dev, u8 axis_enable) }EXPORT_SYMBOL (st_sensors_set_axis_enable); +static void st_reg_disable (void *reg) +{ +regulator_disable (reg); +} +int st_sensors_power_enable (struct iio_dev *indio_dev) {struct st_sensor_data *pdata =iio_priv (indio_dev); +struct device *parent = indio_dev->dev.parent;int err;/* Regulators not mandatory, but if requested we should enable them. */ - pdata->vdd =devm_regulator_get (indio_dev->dev.parent,"vdd" ); + pdata->vdd =devm_regulator_get (parent,"vdd" );if (IS_ERR (pdata->vdd)) {dev_err (&indio_dev->dev,"unable to get Vdd supply\n" );return PTR_ERR (pdata->vdd);
@@ -233,36 +239,26 @@ int st_sensors_power_enable(struct iio_dev *indio_dev)return err; } - pdata->vdd_io =devm_regulator_get (indio_dev->dev.parent,"vddio" ); + err =devm_add_action_or_reset (parent, st_reg_disable, pdata->vdd); +if (err) +return err; + + pdata->vdd_io =devm_regulator_get (parent,"vddio" );if (IS_ERR (pdata->vdd_io)) {dev_err (&indio_dev->dev,"unable to get Vdd_IO supply\n" ); - err =PTR_ERR (pdata->vdd_io); - goto st_sensors_disable_vdd; +return PTR_ERR (pdata->vdd_io); } err =regulator_enable (pdata->vdd_io);if (err !=0 ) {dev_warn (&indio_dev->dev,"Failed to enable specified Vdd_IO supply\n" ); - goto st_sensors_disable_vdd; +return err; } -return 0 ; - -st_sensors_disable_vdd: -regulator_disable (pdata->vdd); -return err; +return devm_add_action_or_reset (parent, st_reg_disable, pdata->vdd_io); }EXPORT_SYMBOL (st_sensors_power_enable); -void st_sensors_power_disable (struct iio_dev *indio_dev) -{ -struct st_sensor_data *pdata =iio_priv (indio_dev); - -regulator_disable (pdata->vdd); -regulator_disable (pdata->vdd_io); -} -EXPORT_SYMBOL (st_sensors_power_disable); -static int st_sensors_set_drdy_int_pin (struct iio_dev *indio_dev,struct st_sensors_platform_data *pdata) {
drivers/iio/gyro/st_gyro_i2c.c +1 -12
@@ -90,16 +90,7 @@ static int st_gyro_i2c_probe(struct i2c_client *client,if (err)return err; - err =st_gyro_common_probe (indio_dev); -if (err <0 ) - goto st_gyro_power_off; - -return 0 ; - -st_gyro_power_off: -st_sensors_power_disable (indio_dev); - -return err; +return st_gyro_common_probe (indio_dev); }static int st_gyro_i2c_remove (struct i2c_client *client)
@@ -108,8 +99,6 @@ static int st_gyro_i2c_remove(struct i2c_client *client)st_gyro_common_remove (indio_dev); -st_sensors_power_disable (indio_dev); -return 0 ; }
drivers/iio/gyro/st_gyro_spi.c +1 -12
@@ -94,16 +94,7 @@ static int st_gyro_spi_probe(struct spi_device *spi)if (err)return err; - err =st_gyro_common_probe (indio_dev); -if (err <0 ) - goto st_gyro_power_off; - -return 0 ; - -st_gyro_power_off: -st_sensors_power_disable (indio_dev); - -return err; +return st_gyro_common_probe (indio_dev); }static int st_gyro_spi_remove (struct spi_device *spi)
@@ -112,8 +103,6 @@ static int st_gyro_spi_remove(struct spi_device *spi)st_gyro_common_remove (indio_dev); -st_sensors_power_disable (indio_dev); -return 0 ; }
drivers/iio/magnetometer/st_magn_i2c.c +1 -12
@@ -86,16 +86,7 @@ static int st_magn_i2c_probe(struct i2c_client *client,if (err)return err; - err =st_magn_common_probe (indio_dev); -if (err <0 ) - goto st_magn_power_off; - -return 0 ; - -st_magn_power_off: -st_sensors_power_disable (indio_dev); - -return err; +return st_magn_common_probe (indio_dev); }static int st_magn_i2c_remove (struct i2c_client *client)
@@ -104,8 +95,6 @@ static int st_magn_i2c_remove(struct i2c_client *client)st_magn_common_remove (indio_dev); -st_sensors_power_disable (indio_dev); -return 0 ; }
drivers/iio/magnetometer/st_magn_spi.c +1 -12
@@ -80,16 +80,7 @@ static int st_magn_spi_probe(struct spi_device *spi)if (err)return err; - err =st_magn_common_probe (indio_dev); -if (err <0 ) - goto st_magn_power_off; - -return 0 ; - -st_magn_power_off: -st_sensors_power_disable (indio_dev); - -return err; +return st_magn_common_probe (indio_dev); }static int st_magn_spi_remove (struct spi_device *spi)
@@ -98,8 +89,6 @@ static int st_magn_spi_remove(struct spi_device *spi)st_magn_common_remove (indio_dev); -st_sensors_power_disable (indio_dev); -return 0 ; }
drivers/iio/pressure/st_pressure_i2c.c +1 -12
@@ -103,16 +103,7 @@ static int st_press_i2c_probe(struct i2c_client *client,if (ret)return ret; - ret =st_press_common_probe (indio_dev); -if (ret <0 ) - goto st_press_power_off; - -return 0 ; - -st_press_power_off: -st_sensors_power_disable (indio_dev); - -return ret; +return st_press_common_probe (indio_dev); }static int st_press_i2c_remove (struct i2c_client *client)
@@ -121,8 +112,6 @@ static int st_press_i2c_remove(struct i2c_client *client)st_press_common_remove (indio_dev); -st_sensors_power_disable (indio_dev); -return 0 ; }
drivers/iio/pressure/st_pressure_spi.c +1 -12
@@ -86,16 +86,7 @@ static int st_press_spi_probe(struct spi_device *spi)if (err)return err; - err =st_press_common_probe (indio_dev); -if (err <0 ) - goto st_press_power_off; - -return 0 ; - -st_press_power_off: -st_sensors_power_disable (indio_dev); - -return err; +return st_press_common_probe (indio_dev); }static int st_press_spi_remove (struct spi_device *spi)
@@ -104,8 +95,6 @@ static int st_press_spi_remove(struct spi_device *spi)st_press_common_remove (indio_dev); -st_sensors_power_disable (indio_dev); -return 0 ; }
include/linux/iio/common/st_sensors.h +0 -2
@@ -293,8 +293,6 @@ int st_sensors_set_axis_enable(struct iio_dev *indio_dev, u8 axis_enable);int st_sensors_power_enable (struct iio_dev *indio_dev); -void st_sensors_power_disable (struct iio_dev *indio_dev); -int st_sensors_debugfs_reg_access (struct iio_dev *indio_dev,unsigned reg,unsigned writeval,unsigned *readval);
Signature · 1 line
2.31.1
PATCH v2 4/5 iio: st_sensors: remove all driver remove functions
In reply to Alexandru ArdeleanAt this point all ST driver remove functions do iio_device_unregister(). This change removes them from them and replaces all iio_device_register() with devm_iio_device_register().
This can be done in a single change relatively easy, since all these remove functions are define in st_sensors.h.
--- drivers/iio/accel/st_accel_core.c | 9 ++------- drivers/iio/accel/st_accel_i2c.c | 10 ---------- drivers/iio/accel/st_accel_spi.c | 10 ---------- drivers/iio/gyro/st_gyro_core.c | 9 ++------- drivers/iio/gyro/st_gyro_i2c.c | 10 ---------- drivers/iio/gyro/st_gyro_spi.c | 10 ---------- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 1 - drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 15 +-------------- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 6 ------ drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 6 ------ drivers/iio/magnetometer/st_magn_core.c | 9 ++------- drivers/iio/magnetometer/st_magn_i2c.c | 10 ---------- drivers/iio/magnetometer/st_magn_spi.c | 10 ---------- drivers/iio/pressure/st_pressure_core.c | 9 ++------- drivers/iio/pressure/st_pressure_i2c.c | 10 ---------- drivers/iio/pressure/st_pressure_spi.c | 10 ---------- include/linux/iio/common/st_sensors.h | 4 ---- 17 files changed, 9 insertions(+), 139 deletions(-)
drivers/iio/accel/st_accel_core.c +2 -7
@@ -1335,6 +1335,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev) {struct st_sensor_data *adata =iio_priv (indio_dev);struct st_sensors_platform_data *pdata =dev_get_platdata (adata->dev); +struct device *parent = indio_dev->dev.parent;int err; indio_dev->modes =INDIO_DIRECT_MODE ;
@@ -1380,16 +1381,10 @@ int st_accel_common_probe(struct iio_dev *indio_dev)return err; } -return iio_device_register (indio_dev); +return devm_iio_device_register (parent, indio_dev); }EXPORT_SYMBOL (st_accel_common_probe); -void st_accel_common_remove (struct iio_dev *indio_dev) -{ -iio_device_unregister (indio_dev); -} -EXPORT_SYMBOL (st_accel_common_remove); -MODULE_AUTHOR ("Denis Ciocca <[email protected]>" );MODULE_DESCRIPTION ("STMicroelectronics accelerometers driver" );MODULE_LICENSE ("GPL v2" );
drivers/iio/accel/st_accel_i2c.c +0 -10
@@ -180,15 +180,6 @@ static int st_accel_i2c_probe(struct i2c_client *client)return st_accel_common_probe (indio_dev); } -static int st_accel_i2c_remove (struct i2c_client *client) -{ -struct iio_dev *indio_dev =i2c_get_clientdata (client); - -st_accel_common_remove (indio_dev); - -return 0 ; -} -static struct i2c_driver st_accel_driver = { .driver = { .name ="st-accel-i2c" ,
@@ -196,7 +187,6 @@ static struct i2c_driver st_accel_driver = { .acpi_match_table = ACPI_PTR(st_accel_acpi_match), }, .probe_new = st_accel_i2c_probe, - .remove = st_accel_i2c_remove, .id_table = st_accel_id_table, };module_i2c_driver (st_accel_driver);
drivers/iio/accel/st_accel_spi.c +0 -10
@@ -130,15 +130,6 @@ static int st_accel_spi_probe(struct spi_device *spi)return st_accel_common_probe (indio_dev); } -static int st_accel_spi_remove (struct spi_device *spi) -{ -struct iio_dev *indio_dev =spi_get_drvdata (spi); - -st_accel_common_remove (indio_dev); - -return 0 ; -} -static const struct spi_device_id st_accel_id_table[] = { {LIS3DH_ACCEL_DEV_NAME }, {LSM330D_ACCEL_DEV_NAME },
@@ -166,7 +157,6 @@ static struct spi_driver st_accel_driver = { .of_match_table = st_accel_of_match, }, .probe = st_accel_spi_probe, - .remove = st_accel_spi_remove, .id_table = st_accel_id_table, };module_spi_driver (st_accel_driver);
drivers/iio/gyro/st_gyro_core.c +2 -7
@@ -478,6 +478,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev) {struct st_sensor_data *gdata =iio_priv (indio_dev);struct st_sensors_platform_data *pdata; +struct device *parent = indio_dev->dev.parent;int err; indio_dev->modes =INDIO_DIRECT_MODE ;
@@ -515,16 +516,10 @@ int st_gyro_common_probe(struct iio_dev *indio_dev)return err; } -return iio_device_register (indio_dev); +return devm_iio_device_register (parent, indio_dev); }EXPORT_SYMBOL (st_gyro_common_probe); -void st_gyro_common_remove (struct iio_dev *indio_dev) -{ -iio_device_unregister (indio_dev); -} -EXPORT_SYMBOL (st_gyro_common_remove); -MODULE_AUTHOR ("Denis Ciocca <[email protected]>" );MODULE_DESCRIPTION ("STMicroelectronics gyroscopes driver" );MODULE_LICENSE ("GPL v2" );
drivers/iio/gyro/st_gyro_i2c.c +0 -10
@@ -93,15 +93,6 @@ static int st_gyro_i2c_probe(struct i2c_client *client,return st_gyro_common_probe (indio_dev); } -static int st_gyro_i2c_remove (struct i2c_client *client) -{ -struct iio_dev *indio_dev =i2c_get_clientdata (client); - -st_gyro_common_remove (indio_dev); - -return 0 ; -} -static const struct i2c_device_id st_gyro_id_table[] = { {L3G4200D_GYRO_DEV_NAME }, {LSM330D_GYRO_DEV_NAME },
@@ -122,7 +113,6 @@ static struct i2c_driver st_gyro_driver = { .of_match_table = st_gyro_of_match, }, .probe = st_gyro_i2c_probe, - .remove = st_gyro_i2c_remove, .id_table = st_gyro_id_table, };module_i2c_driver (st_gyro_driver);
drivers/iio/gyro/st_gyro_spi.c +0 -10
@@ -97,15 +97,6 @@ static int st_gyro_spi_probe(struct spi_device *spi)return st_gyro_common_probe (indio_dev); } -static int st_gyro_spi_remove (struct spi_device *spi) -{ -struct iio_dev *indio_dev =spi_get_drvdata (spi); - -st_gyro_common_remove (indio_dev); - -return 0 ; -} -static const struct spi_device_id st_gyro_id_table[] = { {L3G4200D_GYRO_DEV_NAME }, {LSM330D_GYRO_DEV_NAME },
@@ -126,7 +117,6 @@ static struct spi_driver st_gyro_driver = { .of_match_table = st_gyro_of_match, }, .probe = st_gyro_spi_probe, - .remove = st_gyro_spi_remove, .id_table = st_gyro_id_table, };module_spi_driver (st_gyro_driver);
drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h +0 -1
@@ -18,6 +18,5 @@ struct st_lsm9ds0 { };int st_lsm9ds0_probe (struct st_lsm9ds0 *lsm9ds0,struct regmap *regmap); -int st_lsm9ds0_remove (struct st_lsm9ds0 *lsm9ds0);#endif /* ST_LSM9DS0_H */
drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c +1 -14
@@ -142,23 +142,10 @@ int st_lsm9ds0_probe(struct st_lsm9ds0 *lsm9ds0, struct regmap *regmap)return ret;/* Setup magnetometer device */ - ret =st_lsm9ds0_probe_magn (lsm9ds0, regmap); -if (ret) -st_accel_common_remove (lsm9ds0->accel); - -return ret; +return st_lsm9ds0_probe_magn (lsm9ds0, regmap); }EXPORT_SYMBOL_GPL (st_lsm9ds0_probe); -int st_lsm9ds0_remove (struct st_lsm9ds0 *lsm9ds0) -{ -st_magn_common_remove (lsm9ds0->magn); -st_accel_common_remove (lsm9ds0->accel); - -return 0 ; -} -EXPORT_SYMBOL_GPL (st_lsm9ds0_remove); -MODULE_AUTHOR ("Andy Shevchenko <[email protected]>" );MODULE_DESCRIPTION ("STMicroelectronics LSM9DS0 IMU core driver" );MODULE_LICENSE ("GPL v2" );
drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c +0 -6
@@ -64,18 +64,12 @@ static int st_lsm9ds0_i2c_probe(struct i2c_client *client)return st_lsm9ds0_probe (lsm9ds0, regmap); } -static int st_lsm9ds0_i2c_remove (struct i2c_client *client) -{ -return st_lsm9ds0_remove (i2c_get_clientdata (client)); -} -static struct i2c_driver st_lsm9ds0_driver = { .driver = { .name ="st-lsm9ds0-i2c" , .of_match_table = st_lsm9ds0_of_match, }, .probe_new = st_lsm9ds0_i2c_probe, - .remove = st_lsm9ds0_i2c_remove, .id_table = st_lsm9ds0_id_table, };module_i2c_driver (st_lsm9ds0_driver);
drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c +0 -6
@@ -63,18 +63,12 @@ static int st_lsm9ds0_spi_probe(struct spi_device *spi)return st_lsm9ds0_probe (lsm9ds0, regmap); } -static int st_lsm9ds0_spi_remove (struct spi_device *spi) -{ -return st_lsm9ds0_remove (spi_get_drvdata (spi)); -} -static struct spi_driver st_lsm9ds0_driver = { .driver = { .name ="st-lsm9ds0-spi" , .of_match_table = st_lsm9ds0_of_match, }, .probe = st_lsm9ds0_spi_probe, - .remove = st_lsm9ds0_spi_remove, .id_table = st_lsm9ds0_id_table, };module_spi_driver (st_lsm9ds0_driver);
drivers/iio/magnetometer/st_magn_core.c +2 -7
@@ -612,6 +612,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev) {struct st_sensor_data *mdata =iio_priv (indio_dev);struct st_sensors_platform_data *pdata =dev_get_platdata (mdata->dev); +struct device *parent = indio_dev->dev.parent;int err; indio_dev->modes =INDIO_DIRECT_MODE ;
@@ -650,16 +651,10 @@ int st_magn_common_probe(struct iio_dev *indio_dev)return err; } -return iio_device_register (indio_dev); +return devm_iio_device_register (parent, indio_dev); }EXPORT_SYMBOL (st_magn_common_probe); -void st_magn_common_remove (struct iio_dev *indio_dev) -{ -iio_device_unregister (indio_dev); -} -EXPORT_SYMBOL (st_magn_common_remove); -MODULE_AUTHOR ("Denis Ciocca <[email protected]>" );MODULE_DESCRIPTION ("STMicroelectronics magnetometers driver" );MODULE_LICENSE ("GPL v2" );
drivers/iio/magnetometer/st_magn_i2c.c +0 -10
@@ -89,15 +89,6 @@ static int st_magn_i2c_probe(struct i2c_client *client,return st_magn_common_probe (indio_dev); } -static int st_magn_i2c_remove (struct i2c_client *client) -{ -struct iio_dev *indio_dev =i2c_get_clientdata (client); - -st_magn_common_remove (indio_dev); - -return 0 ; -} -static const struct i2c_device_id st_magn_id_table[] = { {LSM303DLH_MAGN_DEV_NAME }, {LSM303DLHC_MAGN_DEV_NAME },
@@ -117,7 +108,6 @@ static struct i2c_driver st_magn_driver = { .of_match_table = st_magn_of_match, }, .probe = st_magn_i2c_probe, - .remove = st_magn_i2c_remove, .id_table = st_magn_id_table, };module_i2c_driver (st_magn_driver);
drivers/iio/magnetometer/st_magn_spi.c +0 -10
@@ -83,15 +83,6 @@ static int st_magn_spi_probe(struct spi_device *spi)return st_magn_common_probe (indio_dev); } -static int st_magn_spi_remove (struct spi_device *spi) -{ -struct iio_dev *indio_dev =spi_get_drvdata (spi); - -st_magn_common_remove (indio_dev); - -return 0 ; -} -static const struct spi_device_id st_magn_id_table[] = { {LIS3MDL_MAGN_DEV_NAME }, {LSM303AGR_MAGN_DEV_NAME },
@@ -108,7 +99,6 @@ static struct spi_driver st_magn_driver = { .of_match_table = st_magn_of_match, }, .probe = st_magn_spi_probe, - .remove = st_magn_spi_remove, .id_table = st_magn_id_table, };module_spi_driver (st_magn_driver);
drivers/iio/pressure/st_pressure_core.c +2 -7
@@ -678,6 +678,7 @@ int st_press_common_probe(struct iio_dev *indio_dev) {struct st_sensor_data *press_data =iio_priv (indio_dev);struct st_sensors_platform_data *pdata =dev_get_platdata (press_data->dev); +struct device *parent = indio_dev->dev.parent;int err; indio_dev->modes =INDIO_DIRECT_MODE ;
@@ -721,16 +722,10 @@ int st_press_common_probe(struct iio_dev *indio_dev)return err; } -return iio_device_register (indio_dev); +return devm_iio_device_register (parent, indio_dev); }EXPORT_SYMBOL (st_press_common_probe); -void st_press_common_remove (struct iio_dev *indio_dev) -{ -iio_device_unregister (indio_dev); -} -EXPORT_SYMBOL (st_press_common_remove); -MODULE_AUTHOR ("Denis Ciocca <[email protected]>" );MODULE_DESCRIPTION ("STMicroelectronics pressures driver" );MODULE_LICENSE ("GPL v2" );
drivers/iio/pressure/st_pressure_i2c.c +0 -10
@@ -106,15 +106,6 @@ static int st_press_i2c_probe(struct i2c_client *client,return st_press_common_probe (indio_dev); } -static int st_press_i2c_remove (struct i2c_client *client) -{ -struct iio_dev *indio_dev =i2c_get_clientdata (client); - -st_press_common_remove (indio_dev); - -return 0 ; -} -static struct i2c_driver st_press_driver = { .driver = { .name ="st-press-i2c" ,
@@ -122,7 +113,6 @@ static struct i2c_driver st_press_driver = { .acpi_match_table = ACPI_PTR(st_press_acpi_match), }, .probe = st_press_i2c_probe, - .remove = st_press_i2c_remove, .id_table = st_press_id_table, };module_i2c_driver (st_press_driver);
drivers/iio/pressure/st_pressure_spi.c +0 -10
@@ -89,15 +89,6 @@ static int st_press_spi_probe(struct spi_device *spi)return st_press_common_probe (indio_dev); } -static int st_press_spi_remove (struct spi_device *spi) -{ -struct iio_dev *indio_dev =spi_get_drvdata (spi); - -st_press_common_remove (indio_dev); - -return 0 ; -} -static const struct spi_device_id st_press_id_table[] = { {LPS001WP_PRESS_DEV_NAME }, {LPS25H_PRESS_DEV_NAME },
@@ -116,7 +107,6 @@ static struct spi_driver st_press_driver = { .of_match_table = st_press_of_match, }, .probe = st_press_spi_probe, - .remove = st_press_spi_remove, .id_table = st_press_id_table, };module_spi_driver (st_press_driver);
include/linux/iio/common/st_sensors.h +0 -4
@@ -323,21 +323,17 @@ void st_sensors_dev_name_probe(struct device *dev, char *name, int len);/* Accelerometer */ const struct st_sensor_settings *st_accel_get_settings (const char *name);int st_accel_common_probe (struct iio_dev *indio_dev); -void st_accel_common_remove (struct iio_dev *indio_dev);/* Gyroscope */ const struct st_sensor_settings *st_gyro_get_settings (const char *name);int st_gyro_common_probe (struct iio_dev *indio_dev); -void st_gyro_common_remove (struct iio_dev *indio_dev);/* Magnetometer */ const struct st_sensor_settings *st_magn_get_settings (const char *name);int st_magn_common_probe (struct iio_dev *indio_dev); -void st_magn_common_remove (struct iio_dev *indio_dev);/* Pressure */ const struct st_sensor_settings *st_press_get_settings (const char *name);int st_press_common_probe (struct iio_dev *indio_dev); -void st_press_common_remove (struct iio_dev *indio_dev);#endif /* ST_SENSORS_H */
Signature · 1 line
2.31.1
PATCH v2 5/5 iio: st_sensors: remove reference to parent device object on st_sensor_data
In reply to Alexandru ArdeleanI'm not completely sure whether this change makes much sense. The idea behind it, is that all devm_ calls in ST sensors are bound to the parent device object.
However, the reference to that object is kept on both the st_sensor_data struct and the IIO object parent (indio_dev->dev.parent).
This change only adds a bit consistency and uses the reference stored on indio_dev->dev.parent, to enforce the assumption that all ST sensors' devm_ calls are bound to the same reference as the one store on st_sensor_data.
--- drivers/iio/accel/st_accel_core.c | 7 ++++--- drivers/iio/common/st_sensors/st_sensors_i2c.c | 1 - drivers/iio/common/st_sensors/st_sensors_spi.c | 1 - drivers/iio/common/st_sensors/st_sensors_trigger.c | 8 +++++--- drivers/iio/gyro/st_gyro_core.c | 2 +- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 2 -- drivers/iio/magnetometer/st_magn_core.c | 4 ++-- drivers/iio/pressure/st_pressure_core.c | 2 +- include/linux/iio/common/st_sensors.h | 2 -- 9 files changed, 13 insertions(+), 16 deletions(-)
drivers/iio/accel/st_accel_core.c +4 -3
@@ -1186,6 +1186,7 @@ static const struct iio_trigger_ops st_accel_trigger_ops = {*/ static int apply_acpi_orientation (struct iio_dev *indio_dev) { +struct device *parent = indio_dev->dev.parent;struct st_sensor_data *adata =iio_priv (indio_dev);struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL };struct acpi_device *adev;
@@ -1210,7 +1211,7 @@ static int apply_acpi_orientation(struct iio_dev *indio_dev) }; - adev =ACPI_COMPANION (adata->dev); + adev =ACPI_COMPANION (parent);if (!adev)return 0 ;
@@ -1334,8 +1335,8 @@ EXPORT_SYMBOL(st_accel_get_settings);int st_accel_common_probe (struct iio_dev *indio_dev) {struct st_sensor_data *adata =iio_priv (indio_dev); -struct st_sensors_platform_data *pdata =dev_get_platdata (adata->dev);struct device *parent = indio_dev->dev.parent; +struct st_sensors_platform_data *pdata =dev_get_platdata (parent);int err; indio_dev->modes =INDIO_DIRECT_MODE ;
@@ -1355,7 +1356,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev)*/ err =apply_acpi_orientation (indio_dev);if (err) { - err =iio_read_mount_matrix (adata->dev, &adata->mount_matrix); + err =iio_read_mount_matrix (parent, &adata->mount_matrix);if (err)return err; }
drivers/iio/common/st_sensors/st_sensors_i2c.c +0 -1
@@ -57,7 +57,6 @@ int st_sensors_i2c_configure(struct iio_dev *indio_dev, indio_dev->name = client->name; - sdata->dev = &client->dev; sdata->irq = client->irq;return 0 ;
drivers/iio/common/st_sensors/st_sensors_spi.c +0 -1
@@ -109,7 +109,6 @@ int st_sensors_spi_configure(struct iio_dev *indio_dev, indio_dev->name = spi->modalias; - sdata->dev = &spi->dev; sdata->irq = spi->irq;return 0 ;
drivers/iio/common/st_sensors/st_sensors_trigger.c +5 -3
@@ -28,6 +28,7 @@static bool st_sensors_new_samples_available (struct iio_dev *indio_dev,struct st_sensor_data *sdata) { +struct device *parent = indio_dev->dev.parent;int ret, status;/* How would I know if I can't check it? */
@@ -42,7 +43,7 @@ static bool st_sensors_new_samples_available(struct iio_dev *indio_dev, sdata->sensor_settings->drdy_irq.stat_drdy.addr, &status);if (ret <0 ) { -dev_err (sdata->dev,"error checking samples available\n" ); +dev_err (parent,"error checking samples available\n" );return false; }
@@ -75,6 +76,7 @@ static irqreturn_t st_sensors_irq_thread(int irq, void *p)struct iio_trigger *trig = p;struct iio_dev *indio_dev =iio_trigger_get_drvdata (trig);struct st_sensor_data *sdata =iio_priv (indio_dev); +struct device *parent = indio_dev->dev.parent;/* * If this trigger is backed by a hardware interrupt and we have a
@@ -87,7 +89,7 @@ static irqreturn_t st_sensors_irq_thread(int irq, void *p) st_sensors_new_samples_available(indio_dev, sdata)) { iio_trigger_poll_chained(p); } else { -dev_dbg (sdata->dev,"spurious IRQ\n" ); +dev_dbg (parent,"spurious IRQ\n" );return IRQ_NONE ; }
@@ -107,7 +109,7 @@ static irqreturn_t st_sensors_irq_thread(int irq, void *p)*/ while (sdata->hw_irq_trigger &&st_sensors_new_samples_available (indio_dev, sdata)) { -dev_dbg (sdata->dev,"more samples came in during polling\n" ); +dev_dbg (parent,"more samples came in during polling\n" ); sdata->hw_timestamp =iio_get_time_ns (indio_dev);iio_trigger_poll_chained (p); }
drivers/iio/gyro/st_gyro_core.c +1 -1
@@ -492,7 +492,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev) indio_dev->channels = gdata->sensor_settings->ch; indio_dev->num_channels =ST_SENSORS_NUMBER_ALL_CHANNELS ; - err =iio_read_mount_matrix (gdata->dev, &gdata->mount_matrix); + err =iio_read_mount_matrix (parent, &gdata->mount_matrix);if (err)return err;
drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c +0 -2
@@ -90,7 +90,6 @@ static int st_lsm9ds0_probe_accel(struct st_lsm9ds0 *lsm9ds0, struct regmap *reg data =iio_priv (lsm9ds0->accel); data->sensor_settings = (struct st_sensor_settings *)settings; - data->dev = dev; data->irq = lsm9ds0->irq; data->regmap = regmap; data->vdd = lsm9ds0->vdd;
@@ -119,7 +118,6 @@ static int st_lsm9ds0_probe_magn(struct st_lsm9ds0 *lsm9ds0, struct regmap *regm data =iio_priv (lsm9ds0->magn); data->sensor_settings = (struct st_sensor_settings *)settings; - data->dev = dev; data->irq = lsm9ds0->irq; data->regmap = regmap; data->vdd = lsm9ds0->vdd;
drivers/iio/magnetometer/st_magn_core.c +2 -2
@@ -611,8 +611,8 @@ EXPORT_SYMBOL(st_magn_get_settings);int st_magn_common_probe (struct iio_dev *indio_dev) {struct st_sensor_data *mdata =iio_priv (indio_dev); -struct st_sensors_platform_data *pdata =dev_get_platdata (mdata->dev);struct device *parent = indio_dev->dev.parent; +struct st_sensors_platform_data *pdata =dev_get_platdata (parent);int err; indio_dev->modes =INDIO_DIRECT_MODE ;
@@ -626,7 +626,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev) indio_dev->channels = mdata->sensor_settings->ch; indio_dev->num_channels =ST_SENSORS_NUMBER_ALL_CHANNELS ; - err =iio_read_mount_matrix (mdata->dev, &mdata->mount_matrix); + err =iio_read_mount_matrix (parent, &mdata->mount_matrix);if (err)return err;
drivers/iio/pressure/st_pressure_core.c +1 -1
@@ -677,8 +677,8 @@ EXPORT_SYMBOL(st_press_get_settings);int st_press_common_probe (struct iio_dev *indio_dev) {struct st_sensor_data *press_data =iio_priv (indio_dev); -struct st_sensors_platform_data *pdata =dev_get_platdata (press_data->dev);struct device *parent = indio_dev->dev.parent; +struct st_sensors_platform_data *pdata =dev_get_platdata (parent);int err; indio_dev->modes =INDIO_DIRECT_MODE ;
include/linux/iio/common/st_sensors.h +0 -2
@@ -220,7 +220,6 @@ struct st_sensor_settings {/** * struct st_sensor_data - ST sensor device status -* @dev: Pointer to instance of struct device (I2C or SPI). * @trig: The trigger in use by the core driver. * @mount_matrix: The mounting matrix of the sensor. * @sensor_settings: Pointer to the specific sensor settings in use.
@@ -240,7 +239,6 @@ struct st_sensor_settings {* @buffer_data: Data used by buffer part. */ struct st_sensor_data { -struct device *dev;struct iio_trigger *trig;struct iio_mount_matrix mount_matrix;struct st_sensor_settings *sensor_settings;
Signature · 1 line
2.31.1
kernel test robot
build botRe: [PATCH v2 5/5] iio: st_sensors: remove reference to parent device object on st_sensor_data
Thank you for the patch! Perhaps something to improve:
Hi Alexandru,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on iio/togreg]
[also build test WARNING on next-20210817]
[cannot apply to linux/master linus/master v5.14-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Alexandru-Ardelean/iio-st_sensors-convert-probe-functions-to-full-devm/20210816-163158 base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg config: mips-randconfig-c004-20210816 (attached as .config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 44d0a99a12ec7ead4d2f5ef649ba05b40f6d463d)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install mips cross compiling tool for clang build
# apt-get install binutils-mips-linux-gnu
# https://github.com/0day-ci/linux/commit/6fc83d9d7fb9de59586602b0365acb5525a3f0b9
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Alexandru-Ardelean/iio-st_sensors-convert-probe-functions-to-full-devm/20210816-163158 git checkout 6fc83d9d7fb9de59586602b0365acb5525a3f0b9
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=mips clang-analyzer
If you fix the issue, kindly add following tag as appropriate
clang-analyzer warnings: (new ones prefixed by >>)
^~~~~
drivers/media/tuners/max2165.c:66:3: note: Taking false branch
dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg, ret);
^
drivers/media/tuners/max2165.c:24:3: note: expanded from macro 'dprintk'
if (debug) \
^
drivers/media/tuners/max2165.c:66:3: note: Loop condition is false. Exiting loop
dprintk("%s: error reg=0x%x, ret=%i\n", __func__, reg, ret);
^
drivers/media/tuners/max2165.c:23:2: note: expanded from macro 'dprintk'
do { \
^
drivers/media/tuners/max2165.c:67:3: note: Returning without writing to '*p_data'
return -EIO;
^
drivers/media/tuners/max2165.c:101:3: note: Returning from 'max2165_read_reg'
max2165_read_reg(priv, REG_ROM_TABLE_DATA, &dat[i]);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/tuners/max2165.c:99:2: note: Loop condition is false. Execution continues on line 104
for (i = 0; i < 3; i++) {
^
drivers/media/tuners/max2165.c:108:36: note: The left operand of '&' is a garbage value
priv->bb_filter_7mhz_cfg = dat[2] & 0x0F;
~~~~~~ ^
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
4 warnings generated.
drivers/gpu/drm/drm_framebuffer.c:852:2: warning: Call to function 'strcpy' is insecure as it does not provide bounding of the memory buffer. Replace unbounded copy functions with analogous functions that support length arguments such as 'strlcpy'. CWE-119 [clang-analyzer-security.insecureAPI.strcpy]
strcpy(fb->comm, current->comm);
^~~~~~
drivers/gpu/drm/drm_framebuffer.c:852:2: note: Call to function 'strcpy' is insecure as it does not provide bounding of the memory buffer. Replace unbounded copy functions with analogous functions that support length arguments such as 'strlcpy'. CWE-119
strcpy(fb->comm, current->comm);
^~~~~~
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
8 warnings generated.
Suppressed 8 warnings (7 in non-user code, 1 with check filters).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
4 warnings generated.
>> drivers/iio/common/st_sensors/st_sensors_trigger.c:79:17: warning: Value stored to 'parent' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
struct device *parent = indio_dev->dev.parent;
^~~~~~ ~~~~~~~~~~~~~~~~~~~~~
drivers/iio/common/st_sensors/st_sensors_trigger.c:79:17: note: Value stored to 'parent' during its initialization is never read
struct device *parent = indio_dev->dev.parent;
^~~~~~ ~~~~~~~~~~~~~~~~~~~~~ Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 1 warning generated.
Suppressed 1 warnings (1 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 1 warning generated.
Suppressed 1 warnings (1 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 1 warning generated.
Suppressed 1 warnings (1 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 1 warning generated.
Suppressed 1 warnings (1 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 1 warning generated.
Suppressed 1 warnings (1 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 1 warning generated.
Suppressed 1 warnings (1 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 1 warning generated.
Suppressed 1 warnings (1 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 4 warnings generated.
Suppressed 4 warnings (4 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well. 3 warnings generated.
Suppressed 3 warnings (3 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
vim +/parent +79 drivers/iio/common/st_sensors/st_sensors_trigger.c
68
69 /**
70 * st_sensors_irq_thread() - bottom half of the IRQ-based triggers
71 * @irq: irq number
72 * @p: private handler data
73 */
74 static irqreturn_t st_sensors_irq_thread(int irq, void *p)
75 {
76 struct iio_trigger *trig = p;
77 struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
78 struct st_sensor_data *sdata = iio_priv(indio_dev);
> 79 struct device *parent = indio_dev->dev.parent;
80
81 /*
82 * If this trigger is backed by a hardware interrupt and we have a
83 * status register, check if this IRQ came from us. Notice that
84 * we will process also if st_sensors_new_samples_available()
85 * returns negative: if we can't check status, then poll
86 * unconditionally.
87 */
88 if (sdata->hw_irq_trigger &&
89 st_sensors_new_samples_available(indio_dev, sdata)) {
90 iio_trigger_poll_chained(p);
91 } else {
92 dev_dbg(parent, "spurious IRQ\n");
93 return IRQ_NONE;
94 }
95
96 /*
97 * If we have proper level IRQs the handler will be re-entered if
98 * the line is still active, so return here and come back in through
99 * the top half if need be. 100 */
101 if (!sdata->edge_irq)
102 return IRQ_HANDLED;
103
104 /*
105 * If we are using edge IRQs, new samples arrived while processing
106 * the IRQ and those may be missed unless we pick them here, so poll
107 * again. If the sensor delivery frequency is very high, this thread
108 * turns into a polled loop handler.
109 */
110 while (sdata->hw_irq_trigger &&
111 st_sensors_new_samples_available(indio_dev, sdata)) {
112 dev_dbg(parent, "more samples came in during polling\n");
113 sdata->hw_timestamp = iio_get_time_ns(indio_dev);
114 iio_trigger_poll_chained(p);
115 }
116
117 return IRQ_HANDLED;
118 }
119
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Quoted 5 lines · Alexandru Ardelean
Changelog v1 - v2:
* https://lore.kernel.org/linux-iio/[email protected]/
* added patch 'iio:st_sensors: disable regulators after device unregistration'
- splits the regulator disable fix in a separate patch
Entire series makes sense to me, thanks!
Quoted 34 lines
Alexandru Ardelean (5):
iio:st_sensors: disable regulators after device unregistration
iio:st_sensors: removest_sensors_deallocate_trigger()function
iio:st_sensors: removest_sensors_power_disable()function
iio:st_sensors: remove all driver remove functions
iio:st_sensors: remove reference to parent device object on
st_sensor_datadrivers/iio/accel/st_accel_core.c | 32 +++-------- drivers/iio/accel/st_accel_i2c.c | 23 +------- drivers/iio/accel/st_accel_spi.c | 23 +------- .../iio/common/st_sensors/st_sensors_core.c | 34 ++++++------ .../iio/common/st_sensors/st_sensors_i2c.c | 1 - .../iio/common/st_sensors/st_sensors_spi.c | 1 - .../common/st_sensors/st_sensors_trigger.c | 53 +++++++------------ drivers/iio/gyro/st_gyro_core.c | 27 ++-------- drivers/iio/gyro/st_gyro_i2c.c | 23 +------- drivers/iio/gyro/st_gyro_spi.c | 23 +------- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 1 - drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 17 +----- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 6 --- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 6 --- drivers/iio/magnetometer/st_magn_core.c | 29 ++-------- drivers/iio/magnetometer/st_magn_i2c.c | 23 +------- drivers/iio/magnetometer/st_magn_spi.c | 23 +------- drivers/iio/pressure/st_pressure_core.c | 27 ++-------- drivers/iio/pressure/st_pressure_i2c.c | 23 +------- drivers/iio/pressure/st_pressure_spi.c | 23 +------- include/linux/iio/common/st_sensors.h | 13 ----- 21 files changed, 60 insertions(+), 371 deletions(-)--
2.31.1
Signature · 2 lines
With Best Regards, Andy Shevchenko