iio: st_sensors: convert probe functions to full devm
cover iio: st_sensors: convert probe functions to full devm
Continuing from series:
https://lore.kernel.org/linux-iio/[email protected]/
This goes a little further and converts all ST drivers using the st_common bits to devm functions.
As mentioned by Jonathan, the devm unwind is often attached to iio_dev->dev.parent, and something it's attached to some other pointer which references the same device object.
In the last patch, that point is removed, to eliminate doubt about this mix-n-match.
An alternative would be an assert/check somewhere to ensure that 'iio_dev->dev.parent == adata->dev'. But I [personally] don't like it that much.
As mentioned previously, I was also thinking of sending this set with the previous one. But I am usually reserved to send large sets; also, because I don't really like to review large sets [when I'm reviewing other people's code].
Alexandru Ardelean (4):
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 1/4 iio: st_sensors: remove st_sensors_deallocate_trigger() function
This 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 2/4 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,24 +177,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (indio_dev);return 0 ;
drivers/iio/accel/st_accel_spi.c +1 -12
@@ -127,24 +127,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (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,24 +90,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev);return 0 ;
drivers/iio/gyro/st_gyro_spi.c +1 -12
@@ -94,24 +94,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev);return 0 ;
drivers/iio/magnetometer/st_magn_i2c.c +1 -12
@@ -86,24 +86,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev);return 0 ;
drivers/iio/magnetometer/st_magn_spi.c +1 -12
@@ -80,24 +80,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev);return 0 ;
drivers/iio/pressure/st_pressure_i2c.c +1 -12
@@ -103,24 +103,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_press_common_remove (indio_dev);return 0 ;
drivers/iio/pressure/st_pressure_spi.c +1 -12
@@ -86,24 +86,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_press_common_remove (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
Jonathan Cameron
maintainerRe: [PATCH 2/4] iio: st_sensors: remove st_sensors_power_disable() function
Quoted 10 lines · On Mon, 26 Jul 2021 10:14:02 +0300 Alexandru Ardelean <[email protected]>…
This change converts the
st_sensors_power_enable()function to usedevm_add_action_or_reset()handlers to registerregulator_disablehooks 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 callst_sensors_power_disable()first andiio_device_unregister()after that.
Huh. So currently the drivers turn the power off before calling iio_device_unregister()?
That's a bad idea (turn off power when userspace is still available) and looks like a bug fix to me. Perhaps the reorder should be pulled out as a precursor patch in case anyone wants to backport it?
(note I initially thought you were going the other way and was just writing
a rant about breaking the order when I realised you were fixing it ;)
Quoted 338 lines
Signed-off-by Alexandru Ardelean <[email protected]>--- 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,24 +177,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (indio_dev);return 0 ;drivers/iio/accel/st_accel_spi.c +1
-12@@ -127,24 +127,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (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,24 +90,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev);return 0 ;drivers/iio/gyro/st_gyro_spi.c +1
-12@@ -94,24 +94,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev);return 0 ;drivers/iio/magnetometer/st_magn_i2c.c +1
-12@@ -86,24 +86,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev);return 0 ;drivers/iio/magnetometer/st_magn_spi.c +1
-12@@ -80,24 +80,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev);return 0 ;drivers/iio/pressure/st_pressure_i2c.c +1
-12@@ -103,24 +103,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_press_common_remove (indio_dev);return 0 ;drivers/iio/pressure/st_pressure_spi.c +1
-12@@ -86,24 +86,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_press_common_remove (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);
Re: [PATCH 2/4] iio: st_sensors: remove st_sensors_power_disable() function
Quoted 18 lines · Jonathan Cameron
Quoted 10 lines · On Mon, 26 Jul 2021 10:14:02 +0300 Alexandru Ardelean <[email protected]>…
This change converts the
st_sensors_power_enable()function to usedevm_add_action_or_reset()handlers to registerregulator_disablehooks 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 callst_sensors_power_disable()first andiio_device_unregister()after that.Huh. So currently the drivers turn the power off before calling
iio_device_unregister()?
Quoted 6 lines
That's a bad idea (turn off power when userspace is still available) and looks like a bug fix to me. Perhaps the reorder should be pulled out as a precursor patch in case anyone wants to backport it?
(note I initially thought you were going the other way and was just writing
a rant about breaking the order when I realised you were fixing it ;)
Probably the best advantage of devm_ functions .
Not needing to care about un-init order.
I hated debugging driver crashes when they were unloaded, usually because the driver gets into a weird state.
I'll send a V2 with the re-order fixes in the front.
Quoted 340 lines
Quoted 339 lines
Signed-off-by Alexandru Ardelean <[email protected]>--- 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,24 +177,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (indio_dev);return 0 ;drivers/iio/accel/st_accel_spi.c +1
-12@@ -127,24 +127,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (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,24 +90,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev);return 0 ;drivers/iio/gyro/st_gyro_spi.c +1
-12@@ -94,24 +94,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev);return 0 ;drivers/iio/magnetometer/st_magn_i2c.c +1
-12@@ -86,24 +86,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev);return 0 ;drivers/iio/magnetometer/st_magn_spi.c +1
-12@@ -80,24 +80,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev);return 0 ;drivers/iio/pressure/st_pressure_i2c.c +1
-12@@ -103,24 +103,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_press_common_remove (indio_dev);return 0 ;drivers/iio/pressure/st_pressure_spi.c +1
-12@@ -86,24 +86,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_press_common_remove (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);
Re: [PATCH 2/4] iio: st_sensors: remove st_sensors_power_disable() function
Quoted 20 lines · Alexandru Ardelean
Quoted 18 lines · Jonathan Cameron
Quoted 10 lines · On Mon, 26 Jul 2021 10:14:02 +0300 Alexandru Ardelean <[email protected]>…
This change converts the
st_sensors_power_enable()function to usedevm_add_action_or_reset()handlers to registerregulator_disablehooks 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 callst_sensors_power_disable()first andiio_device_unregister()after that.Huh. So currently the drivers turn the power off before calling
iio_device_unregister()?
Quoted 6 lines
Quoted 6 lines
That's a bad idea (turn off power when userspace is still available) and looks like a bug fix to me. Perhaps the reorder should be pulled out as a precursor patch in case anyone wants to backport it?
(note I initially thought you were going the other way and was just writing
a rant about breaking the order when I realised you were fixing it ;)
I'm seeing a bit of a clash with this patch [by Andy from April 2021]:
https://lore.kernel.org/linux-devicetree/[email protected]/
I can do the fix commits, but they will be short-lived, since they will be applied on 5.13 and onwards.
We'd need maybe another set for the LTS kernels.
So, how should we proceed here?
I think I'll do the fix commits anyway for this set.
Thanks
Alex
Quoted 349 lines
Probably the best advantage of
devm_functions .
Not needing to care about un-init order.I hated debugging driver crashes when they were unloaded, usually because the driver gets into a weird state.
I'll send a V2 with the re-order fixes in the front.
Quoted 340 lines
Quoted 339 lines
Signed-off-by Alexandru Ardelean <[email protected]>--- 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,24 +177,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (indio_dev);return 0 ;drivers/iio/accel/st_accel_spi.c +1
-12@@ -127,24 +127,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (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,24 +90,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev);return 0 ;drivers/iio/gyro/st_gyro_spi.c +1
-12@@ -94,24 +94,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev);return 0 ;drivers/iio/magnetometer/st_magn_i2c.c +1
-12@@ -86,24 +86,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev);return 0 ;drivers/iio/magnetometer/st_magn_spi.c +1
-12@@ -80,24 +80,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev);return 0 ;drivers/iio/pressure/st_pressure_i2c.c +1
-12@@ -103,24 +103,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_press_common_remove (indio_dev);return 0 ;drivers/iio/pressure/st_pressure_spi.c +1
-12@@ -86,24 +86,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_press_common_remove (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);
Jonathan Cameron
maintainerRe: [PATCH 2/4] iio: st_sensors: remove st_sensors_power_disable() function
Quoted 30 lines · On Mon, 16 Aug 2021 10:48:16 +0300 Alexandru Ardelean <[email protected]>…
Quoted 20 lines · Alexandru Ardelean
Quoted 18 lines · Jonathan Cameron
Quoted 10 lines · On Mon, 26 Jul 2021 10:14:02 +0300 Alexandru Ardelean <[email protected]>…
This change converts the
st_sensors_power_enable()function to usedevm_add_action_or_reset()handlers to registerregulator_disablehooks 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 callst_sensors_power_disable()first andiio_device_unregister()after that.Huh. So currently the drivers turn the power off before calling
iio_device_unregister()?Quoted 6 lines
Quoted 6 lines
That's a bad idea (turn off power when userspace is still available) and looks like a bug fix to me. Perhaps the reorder should be pulled out as a precursor patch in case anyone wants to backport it?
(note I initially thought you were going the other way and was just writing
a rant about breaking the order when I realised you were fixing it ;)I'm seeing a bit of a clash with this patch [by Andy from April 2021]:
Quoted 8 lines
https://lore.kernel.org/linux-devicetree/[email protected]/
I can do the fix commits, but they will be short-lived, since they will be applied on 5.13 and onwards.
We'd need maybe another set for the LTS kernels.So, how should we proceed here?
I think I'll do the fix commits anyway for this set.
Carry on with pulling this out as a fix. That at least gives us a clear patch to point at when doing any necessary backports.
Whilst this particular ordering thing is a potential issue, it's in a remove path that won't get heavily used and is a race that may or may not actually cause problems.
The main issue with the current ordering is the difficulty of
being sure it is right. So I would not worry that much about
manual backports unless someone asks.
Jonathan
Quoted 353 lines
Thanks
AlexQuoted 349 lines
Probably the best advantage of
devm_functions .
Not needing to care about un-init order.I hated debugging driver crashes when they were unloaded, usually because the driver gets into a weird state.
I'll send a V2 with the re-order fixes in the front.
Quoted 340 lines
Quoted 339 lines
Signed-off-by Alexandru Ardelean <[email protected]>--- 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,24 +177,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (indio_dev);return 0 ;drivers/iio/accel/st_accel_spi.c +1
-12@@ -127,24 +127,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_accel_common_remove (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,24 +90,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev);return 0 ;drivers/iio/gyro/st_gyro_spi.c +1
-12@@ -94,24 +94,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_gyro_common_remove (indio_dev);return 0 ;drivers/iio/magnetometer/st_magn_i2c.c +1
-12@@ -86,24 +86,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev);return 0 ;drivers/iio/magnetometer/st_magn_spi.c +1
-12@@ -80,24 +80,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_magn_common_remove (indio_dev);return 0 ;drivers/iio/pressure/st_pressure_i2c.c +1
-12@@ -103,24 +103,13 @@ 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) {struct iio_dev *indio_dev =i2c_get_clientdata (client); -st_sensors_power_disable (indio_dev); -st_press_common_remove (indio_dev);return 0 ;drivers/iio/pressure/st_pressure_spi.c +1
-12@@ -86,24 +86,13 @@ 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) {struct iio_dev *indio_dev =spi_get_drvdata (spi); -st_sensors_power_disable (indio_dev); -st_press_common_remove (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);
PATCH 3/4 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
Re: [PATCH 3/4] iio: st_sensors: remove all driver remove functions
Quoted 6 lines · Alexandru Ardelean
At this point all ST driver remove functions do
iio_device_unregister(). This change removes them from them and replaces alliio_device_register()withdevm_iio_device_register().This can be done in a single change relatively easy, since all these remove
easily
Quoted 1 line
functions are define in
st_sensors.h.
defined
Quoted 4 lines
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 ------
I will check these later on, but the rule of thumb about devm_*() is that there shouldn't be gaps (non-devm) before any devm call.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH 4/4 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
Jonathan Cameron
maintainerQuoted 15 lines · On Mon, 26 Jul 2021 10:14:00 +0300 Alexandru Ardelean <[email protected]>…
Continuing from series:
https://lore.kernel.org/linux-iio/[email protected]/This goes a little further and converts all ST drivers using the
st_commonbits to devm functions.
As mentioned by Jonathan, the devm unwind is often attached toiio_dev->dev.parent, and something it's attached to some other pointer which references the same device object.In the last patch, that point is removed, to eliminate doubt about this mix-n-match.
An alternative would be an assert/check somewhere to ensure that 'iio_dev->dev.parent==adata->dev'. But I [personally] don't like it that much.
Quoted 4 lines
As mentioned previously, I was also thinking of sending this set with the previous one. But I am usually reserved to send large sets; also, because I don't really like to review large sets [when I'm reviewing other people's code].
I'm fine with this, though I would like the reorder pulled out as as separate patch and moved to the front of the series. It's a good change in it's own right and will also make the rest of the series more 'obviously' correct as you'll always be stripping off the last thing done in remove.
Otherwise, needs some time for others to take a look.
thanks,
Jonathan
Quoted 31 lines
Alexandru Ardelean (4):
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(-)