iio: light: st_uvis25: Drop unneeded casting when print error code
PATCH 1/5 iio: light: st_uvis25: Drop unneeded casting when print error code
Explicit casting in printf() usually shows that something is not okay. Here, we really don't need it by providing correct specifier.
--- drivers/iio/light/st_uvis25_i2c.c | 4 ++-- drivers/iio/light/st_uvis25_spi.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/iio/light/st_uvis25_i2c.c +2 -2
@@ -31,8 +31,8 @@ static int st_uvis25_i2c_probe(struct i2c_client *client, regmap =devm_regmap_init_i2c (client, &st_uvis25_i2c_regmap_config);if (IS_ERR (regmap)) { -dev_err (&client->dev,"Failed to register i2c regmap %d\n" , - (int )PTR_ERR (regmap)); +dev_err (&client->dev,"Failed to register i2c regmap %ld\n" , +PTR_ERR (regmap));return PTR_ERR (regmap); }
drivers/iio/light/st_uvis25_spi.c +2 -2
@@ -31,8 +31,8 @@ static int st_uvis25_spi_probe(struct spi_device *spi) regmap =devm_regmap_init_spi (spi, &st_uvis25_spi_regmap_config);if (IS_ERR (regmap)) { -dev_err (&spi->dev,"Failed to register spi regmap %d\n" , - (int )PTR_ERR (regmap)); +dev_err (&spi->dev,"Failed to register spi regmap %ld\n" , +PTR_ERR (regmap));return PTR_ERR (regmap); }
Signature · 1 line
2.25.1
PATCH 2/5 iio: st_sensors: Use dev_get_platdata() to get platform_data
Use dev_get_platdata() to get the platform_data instead of referencing it directly.
--- drivers/iio/accel/st_accel_core.c | 3 +-- drivers/iio/common/st_sensors/st_sensors_spi.c | 2 +- drivers/iio/pressure/st_pressure_core.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-)
drivers/iio/accel/st_accel_core.c +1 -2
@@ -1170,8 +1170,7 @@ 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 = - (struct st_sensors_platform_data *)adata->dev->platform_data; +struct st_sensors_platform_data *pdata =dev_get_platdata (adata->dev);struct iio_chan_spec *channels;size_t channels_size;int err;
drivers/iio/common/st_sensors/st_sensors_spi.c +1 -1
@@ -44,7 +44,7 @@ static bool st_sensors_is_spi_3_wire(struct spi_device *spi)if (device_property_read_bool (dev,"spi-3wire" ))return true; - pdata = (struct st_sensors_platform_data *)dev->platform_data; + pdata =dev_get_platdata (dev);if (pdata && pdata->spi_3wire)return true;
drivers/iio/pressure/st_pressure_core.c +1 -2
@@ -683,8 +683,7 @@ 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 = - (struct st_sensors_platform_data *)press_data->dev->platform_data; +struct st_sensors_platform_data *pdata =dev_get_platdata (press_data->dev);int err; indio_dev->modes =INDIO_DIRECT_MODE ;
Signature · 1 line
2.25.1
PATCH 3/5 iio: st_sensors: Drop unneeded explicit castings
In reply to Andy ShevchenkoIn few places the unnecessary explicit castings are being used. Drop them for good.
--- drivers/iio/accel/st_accel_buffer.c | 3 +-- drivers/iio/gyro/st_gyro_buffer.c | 3 +-- drivers/iio/gyro/st_gyro_core.c | 9 +++++---- drivers/iio/pressure/st_pressure_core.c | 4 +--- 4 files changed, 8 insertions(+), 11 deletions(-)
drivers/iio/accel/st_accel_buffer.c +1 -2
@@ -37,8 +37,7 @@ static int st_accel_buffer_postenable(struct iio_dev *indio_dev)if (err <0 )return err; - err =st_sensors_set_axis_enable (indio_dev, - (u8 )indio_dev->active_scan_mask[0 ]); + err =st_sensors_set_axis_enable (indio_dev, indio_dev->active_scan_mask[0 ]);if (err <0 ) goto st_accel_buffer_predisable;
drivers/iio/gyro/st_gyro_buffer.c +1 -2
@@ -37,8 +37,7 @@ static int st_gyro_buffer_postenable(struct iio_dev *indio_dev)if (err <0 )return err; - err =st_sensors_set_axis_enable (indio_dev, - (u8 )indio_dev->active_scan_mask[0 ]); + err =st_sensors_set_axis_enable (indio_dev, indio_dev->active_scan_mask[0 ]);if (err <0 ) goto st_gyro_buffer_predisable;
drivers/iio/gyro/st_gyro_core.c +5 -4
@@ -460,6 +460,7 @@ EXPORT_SYMBOL(st_gyro_get_settings);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;int err; indio_dev->modes =INDIO_DIRECT_MODE ;
@@ -477,12 +478,12 @@ 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 ; - gdata->current_fullscale = (struct st_sensor_fullscale_avl *) - &gdata->sensor_settings->fs.fs_avl[0 ]; + gdata->current_fullscale = &gdata->sensor_settings->fs.fs_avl[0 ]; gdata->odr = gdata->sensor_settings->odr.odr_avl[0 ].hz; - err =st_sensors_init_sensor (indio_dev, - (struct st_sensors_platform_data *)&gyro_pdata); + pdata = (struct st_sensors_platform_data *)&gyro_pdata; + + err =st_sensors_init_sensor (indio_dev, pdata);if (err <0 ) goto st_gyro_power_off;
drivers/iio/pressure/st_pressure_core.c +1 -3
@@ -707,9 +707,7 @@ int st_press_common_probe(struct iio_dev *indio_dev) indio_dev->channels = press_data->sensor_settings->ch; indio_dev->num_channels = press_data->sensor_settings->num_ch; - press_data->current_fullscale = - (struct st_sensor_fullscale_avl *) - &press_data->sensor_settings->fs.fs_avl[0 ]; + press_data->current_fullscale = &press_data->sensor_settings->fs.fs_avl[0 ]; press_data->odr = press_data->sensor_settings->odr.odr_avl[0 ].hz;
Signature · 1 line
2.25.1
PATCH 4/5 iio: st_sensors: Drop unneeded casting when print error code
In reply to Andy ShevchenkoExplicit casting in printf() usually shows that something is not okay. Here, we really don't need it by providing correct specifier.
--- drivers/iio/common/st_sensors/st_sensors_i2c.c | 4 ++-- drivers/iio/common/st_sensors/st_sensors_spi.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/iio/common/st_sensors/st_sensors_i2c.c +2 -2
@@ -49,8 +49,8 @@ int st_sensors_i2c_configure(struct iio_dev *indio_dev, sdata->regmap =devm_regmap_init_i2c (client, config);if (IS_ERR (sdata->regmap)) { -dev_err (&client->dev,"Failed to register i2c regmap (%d)\n" , - (int )PTR_ERR (sdata->regmap)); +dev_err (&client->dev,"Failed to register i2c regmap (%ld)\n" , +PTR_ERR (sdata->regmap));return PTR_ERR (sdata->regmap); }
drivers/iio/common/st_sensors/st_sensors_spi.c +2 -2
@@ -101,8 +101,8 @@ int st_sensors_spi_configure(struct iio_dev *indio_dev, sdata->regmap =devm_regmap_init_spi (spi, config);if (IS_ERR (sdata->regmap)) { -dev_err (&spi->dev,"Failed to register spi regmap (%d)\n" , - (int )PTR_ERR (sdata->regmap)); +dev_err (&spi->dev,"Failed to register spi regmap (%ld)\n" , +PTR_ERR (sdata->regmap));return PTR_ERR (sdata->regmap); }
Signature · 1 line
2.25.1
PATCH 5/5 iio: st_sensors: Join string literals back
In reply to Andy ShevchenkoFor easy grepping on debug purposes join string literals back in the messages.
No functional change.
--- drivers/iio/common/st_sensors/st_sensors_core.c | 3 +-- drivers/iio/common/st_sensors/st_sensors_trigger.c | 13 ++++--------- 2 files changed, 5 insertions(+), 11 deletions(-)
drivers/iio/common/st_sensors/st_sensors_core.c +1 -2
@@ -278,8 +278,7 @@ static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev, !sdata->sensor_settings->drdy_irq.int2.addr) {if (pdata->drdy_int_pin)dev_info (&indio_dev->dev, -"DRDY on pin INT%d specified, but sensor " -"does not support interrupts\n" , +"DRDY on pin INT%d specified, but sensor does not support interrupts\n" , pdata->drdy_int_pin);return 0 ; }
drivers/iio/common/st_sensors/st_sensors_trigger.c +4 -9
@@ -44,8 +44,7 @@ static int 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 (sdata->dev,"error checking samples available\n" );return ret; }
@@ -148,9 +147,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,case IRQF_TRIGGER_LOW :if (!sdata->sensor_settings->drdy_irq.addr_ihl) {dev_err (&indio_dev->dev, -"falling/low specified for IRQ " -"but hardware supports only rising/high: " -"will request rising/high\n" ); +"falling/low specified for IRQ but hardware supports only rising/high: will request rising/high\n" );if (irq_trig ==IRQF_TRIGGER_FALLING ) irq_trig =IRQF_TRIGGER_RISING ;if (irq_trig ==IRQF_TRIGGER_LOW )
@@ -163,8 +160,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,if (err <0 ) goto iio_trigger_free;dev_info (&indio_dev->dev, -"interrupts on the falling edge or " -"active low level\n" ); +"interrupts on the falling edge or active low level\n" ); }break ;case IRQF_TRIGGER_RISING :
@@ -178,8 +174,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,default :/* This is the most preferred mode, if possible */ dev_err (&indio_dev->dev, -"unsupported IRQ trigger specified (%lx), enforce " -"rising edge\n" , irq_trig); +"unsupported IRQ trigger specified (%lx), enforce rising edge\n" , irq_trig); irq_trig =IRQF_TRIGGER_RISING ; }
Signature · 1 line
2.25.1