* [PATCH v2 2/8] iio: st_sensors: Use dev_get_platdata() to get platform_data
2020-03-13 10:49 [PATCH v2 1/8] iio: light: st_uvis25: Drop unneeded casting when print error code Andy Shevchenko
@ 2020-03-13 10:49 ` Andy Shevchenko
2020-03-15 12:34 ` Jonathan Cameron
2020-03-13 10:49 ` [PATCH v2 3/8] iio: st_sensors: Drop unneeded explicit castings Andy Shevchenko
` (6 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Andy Shevchenko @ 2020-03-13 10:49 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio, Denis Ciocca
Cc: Andy Shevchenko
Use dev_get_platdata() to get the platform_data instead of
referencing it directly.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: no change
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(-)
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 7320275c7e56..5f7bdb1f55d1 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -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;
diff --git a/drivers/iio/common/st_sensors/st_sensors_spi.c b/drivers/iio/common/st_sensors/st_sensors_spi.c
index 1275fb0eda31..dcbdef4a77f8 100644
--- a/drivers/iio/common/st_sensors/st_sensors_spi.c
+++ b/drivers/iio/common/st_sensors/st_sensors_spi.c
@@ -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;
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index bd972cec4830..8bb47c3b4d6b 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -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;
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v2 2/8] iio: st_sensors: Use dev_get_platdata() to get platform_data
2020-03-13 10:49 ` [PATCH v2 2/8] iio: st_sensors: Use dev_get_platdata() to get platform_data Andy Shevchenko
@ 2020-03-15 12:34 ` Jonathan Cameron
0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2020-03-15 12:34 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, Denis Ciocca
On Fri, 13 Mar 2020 12:49:49 +0200
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> Use dev_get_platdata() to get the platform_data instead of
> referencing it directly.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied. Thanks,
Jonathan
> ---
> v2: no change
> 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(-)
>
> diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
> index 7320275c7e56..5f7bdb1f55d1 100644
> --- a/drivers/iio/accel/st_accel_core.c
> +++ b/drivers/iio/accel/st_accel_core.c
> @@ -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;
> diff --git a/drivers/iio/common/st_sensors/st_sensors_spi.c b/drivers/iio/common/st_sensors/st_sensors_spi.c
> index 1275fb0eda31..dcbdef4a77f8 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_spi.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_spi.c
> @@ -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;
>
> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
> index bd972cec4830..8bb47c3b4d6b 100644
> --- a/drivers/iio/pressure/st_pressure_core.c
> +++ b/drivers/iio/pressure/st_pressure_core.c
> @@ -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;
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 3/8] iio: st_sensors: Drop unneeded explicit castings
2020-03-13 10:49 [PATCH v2 1/8] iio: light: st_uvis25: Drop unneeded casting when print error code Andy Shevchenko
2020-03-13 10:49 ` [PATCH v2 2/8] iio: st_sensors: Use dev_get_platdata() to get platform_data Andy Shevchenko
@ 2020-03-13 10:49 ` Andy Shevchenko
2020-03-15 12:38 ` Jonathan Cameron
2020-03-13 10:49 ` [PATCH v2 4/8] iio: st_sensors: Drop unneeded casting when print error code Andy Shevchenko
` (5 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Andy Shevchenko @ 2020-03-13 10:49 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio, Denis Ciocca
Cc: Andy Shevchenko
In few places the unnecessary explicit castings are being used.
Drop them for good.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: more conversions to cast-less approach
drivers/iio/accel/st_accel_buffer.c | 3 +--
drivers/iio/accel/st_accel_core.c | 3 +--
drivers/iio/common/st_sensors/st_sensors_core.c | 3 +--
drivers/iio/gyro/st_gyro_buffer.c | 3 +--
drivers/iio/gyro/st_gyro_core.c | 9 +++++----
drivers/iio/magnetometer/st_magn_core.c | 3 +--
drivers/iio/pressure/st_pressure_core.c | 4 +---
7 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c
index 9f2b40474b8e..b5c814ef1637 100644
--- a/drivers/iio/accel/st_accel_buffer.c
+++ b/drivers/iio/accel/st_accel_buffer.c
@@ -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;
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 5f7bdb1f55d1..e2ec5d127495 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -1203,8 +1203,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
"failed to apply ACPI orientation data: %d\n", err);
indio_dev->channels = channels;
- adata->current_fullscale = (struct st_sensor_fullscale_avl *)
- &adata->sensor_settings->fs.fs_avl[0];
+ adata->current_fullscale = &adata->sensor_settings->fs.fs_avl[0];
adata->odr = adata->sensor_settings->odr.odr_avl[0].hz;
if (!pdata)
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index e051edbc43c1..804a9068e687 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -150,8 +150,7 @@ static int st_sensors_set_fullscale(struct iio_dev *indio_dev, unsigned int fs)
if (err < 0)
goto st_accel_set_fullscale_error;
- sdata->current_fullscale = (struct st_sensor_fullscale_avl *)
- &sdata->sensor_settings->fs.fs_avl[i];
+ sdata->current_fullscale = &sdata->sensor_settings->fs.fs_avl[i];
return err;
st_accel_set_fullscale_error:
diff --git a/drivers/iio/gyro/st_gyro_buffer.c b/drivers/iio/gyro/st_gyro_buffer.c
index 7465ad62391c..9c92ff7a82be 100644
--- a/drivers/iio/gyro/st_gyro_buffer.c
+++ b/drivers/iio/gyro/st_gyro_buffer.c
@@ -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;
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index 26c50b24bc08..c8aa051995d3 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -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;
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index e68184a93a6d..79de721e6015 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -506,8 +506,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;
- mdata->current_fullscale = (struct st_sensor_fullscale_avl *)
- &mdata->sensor_settings->fs.fs_avl[0];
+ mdata->current_fullscale = &mdata->sensor_settings->fs.fs_avl[0];
mdata->odr = mdata->sensor_settings->odr.odr_avl[0].hz;
err = st_sensors_init_sensor(indio_dev, NULL);
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 8bb47c3b4d6b..789a2928504a 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -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;
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v2 3/8] iio: st_sensors: Drop unneeded explicit castings
2020-03-13 10:49 ` [PATCH v2 3/8] iio: st_sensors: Drop unneeded explicit castings Andy Shevchenko
@ 2020-03-15 12:38 ` Jonathan Cameron
0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2020-03-15 12:38 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, Denis Ciocca
On Fri, 13 Mar 2020 12:49:50 +0200
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> In few places the unnecessary explicit castings are being used.
> Drop them for good.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied. Thanks,
Jonathan
> ---
> v2: more conversions to cast-less approach
> drivers/iio/accel/st_accel_buffer.c | 3 +--
> drivers/iio/accel/st_accel_core.c | 3 +--
> drivers/iio/common/st_sensors/st_sensors_core.c | 3 +--
> drivers/iio/gyro/st_gyro_buffer.c | 3 +--
> drivers/iio/gyro/st_gyro_core.c | 9 +++++----
> drivers/iio/magnetometer/st_magn_core.c | 3 +--
> drivers/iio/pressure/st_pressure_core.c | 4 +---
> 7 files changed, 11 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c
> index 9f2b40474b8e..b5c814ef1637 100644
> --- a/drivers/iio/accel/st_accel_buffer.c
> +++ b/drivers/iio/accel/st_accel_buffer.c
> @@ -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;
>
> diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
> index 5f7bdb1f55d1..e2ec5d127495 100644
> --- a/drivers/iio/accel/st_accel_core.c
> +++ b/drivers/iio/accel/st_accel_core.c
> @@ -1203,8 +1203,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
> "failed to apply ACPI orientation data: %d\n", err);
>
> indio_dev->channels = channels;
> - adata->current_fullscale = (struct st_sensor_fullscale_avl *)
> - &adata->sensor_settings->fs.fs_avl[0];
> + adata->current_fullscale = &adata->sensor_settings->fs.fs_avl[0];
> adata->odr = adata->sensor_settings->odr.odr_avl[0].hz;
>
> if (!pdata)
> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
> index e051edbc43c1..804a9068e687 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_core.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_core.c
> @@ -150,8 +150,7 @@ static int st_sensors_set_fullscale(struct iio_dev *indio_dev, unsigned int fs)
> if (err < 0)
> goto st_accel_set_fullscale_error;
>
> - sdata->current_fullscale = (struct st_sensor_fullscale_avl *)
> - &sdata->sensor_settings->fs.fs_avl[i];
> + sdata->current_fullscale = &sdata->sensor_settings->fs.fs_avl[i];
> return err;
>
> st_accel_set_fullscale_error:
> diff --git a/drivers/iio/gyro/st_gyro_buffer.c b/drivers/iio/gyro/st_gyro_buffer.c
> index 7465ad62391c..9c92ff7a82be 100644
> --- a/drivers/iio/gyro/st_gyro_buffer.c
> +++ b/drivers/iio/gyro/st_gyro_buffer.c
> @@ -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;
>
> diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
> index 26c50b24bc08..c8aa051995d3 100644
> --- a/drivers/iio/gyro/st_gyro_core.c
> +++ b/drivers/iio/gyro/st_gyro_core.c
> @@ -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;
>
> diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
> index e68184a93a6d..79de721e6015 100644
> --- a/drivers/iio/magnetometer/st_magn_core.c
> +++ b/drivers/iio/magnetometer/st_magn_core.c
> @@ -506,8 +506,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;
>
> - mdata->current_fullscale = (struct st_sensor_fullscale_avl *)
> - &mdata->sensor_settings->fs.fs_avl[0];
> + mdata->current_fullscale = &mdata->sensor_settings->fs.fs_avl[0];
> mdata->odr = mdata->sensor_settings->odr.odr_avl[0].hz;
>
> err = st_sensors_init_sensor(indio_dev, NULL);
> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
> index 8bb47c3b4d6b..789a2928504a 100644
> --- a/drivers/iio/pressure/st_pressure_core.c
> +++ b/drivers/iio/pressure/st_pressure_core.c
> @@ -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;
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 4/8] iio: st_sensors: Drop unneeded casting when print error code
2020-03-13 10:49 [PATCH v2 1/8] iio: light: st_uvis25: Drop unneeded casting when print error code Andy Shevchenko
2020-03-13 10:49 ` [PATCH v2 2/8] iio: st_sensors: Use dev_get_platdata() to get platform_data Andy Shevchenko
2020-03-13 10:49 ` [PATCH v2 3/8] iio: st_sensors: Drop unneeded explicit castings Andy Shevchenko
@ 2020-03-13 10:49 ` Andy Shevchenko
2020-03-15 12:40 ` Jonathan Cameron
2020-03-13 10:49 ` [PATCH v2 5/8] iio: st_sensors: Join string literals back Andy Shevchenko
` (4 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Andy Shevchenko @ 2020-03-13 10:49 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio, Denis Ciocca
Cc: Andy Shevchenko
Explicit casting in printf() usually shows that something is not okay.
Here, we really don't need it by providing correct specifier.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: no change
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(-)
diff --git a/drivers/iio/common/st_sensors/st_sensors_i2c.c b/drivers/iio/common/st_sensors/st_sensors_i2c.c
index 286830fb5d35..b400560bac93 100644
--- a/drivers/iio/common/st_sensors/st_sensors_i2c.c
+++ b/drivers/iio/common/st_sensors/st_sensors_i2c.c
@@ -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);
}
diff --git a/drivers/iio/common/st_sensors/st_sensors_spi.c b/drivers/iio/common/st_sensors/st_sensors_spi.c
index dcbdef4a77f8..ee70515bb89f 100644
--- a/drivers/iio/common/st_sensors/st_sensors_spi.c
+++ b/drivers/iio/common/st_sensors/st_sensors_spi.c
@@ -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);
}
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v2 4/8] iio: st_sensors: Drop unneeded casting when print error code
2020-03-13 10:49 ` [PATCH v2 4/8] iio: st_sensors: Drop unneeded casting when print error code Andy Shevchenko
@ 2020-03-15 12:40 ` Jonathan Cameron
0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2020-03-15 12:40 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, Denis Ciocca
On Fri, 13 Mar 2020 12:49:51 +0200
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> Explicit casting in printf() usually shows that something is not okay.
> Here, we really don't need it by providing correct specifier.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
applied, thanks.
Jonathan
> ---
> v2: no change
> 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(-)
>
> diff --git a/drivers/iio/common/st_sensors/st_sensors_i2c.c b/drivers/iio/common/st_sensors/st_sensors_i2c.c
> index 286830fb5d35..b400560bac93 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_i2c.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_i2c.c
> @@ -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);
> }
>
> diff --git a/drivers/iio/common/st_sensors/st_sensors_spi.c b/drivers/iio/common/st_sensors/st_sensors_spi.c
> index dcbdef4a77f8..ee70515bb89f 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_spi.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_spi.c
> @@ -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);
> }
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 5/8] iio: st_sensors: Join string literals back
2020-03-13 10:49 [PATCH v2 1/8] iio: light: st_uvis25: Drop unneeded casting when print error code Andy Shevchenko
` (2 preceding siblings ...)
2020-03-13 10:49 ` [PATCH v2 4/8] iio: st_sensors: Drop unneeded casting when print error code Andy Shevchenko
@ 2020-03-13 10:49 ` Andy Shevchenko
2020-03-15 12:40 ` Jonathan Cameron
2020-03-13 10:49 ` [PATCH v2 6/8] iio: humidity: hts221: Use dev_get_platdata() to get platform_data Andy Shevchenko
` (3 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Andy Shevchenko @ 2020-03-13 10:49 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio, Denis Ciocca
Cc: Andy Shevchenko
For easy grepping on debug purposes join string literals back in
the messages.
No functional change.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: no 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(-)
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 804a9068e687..2e42838ca4f4 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -277,8 +277,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;
}
diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
index e817537cdfb5..0507283bd4c1 100644
--- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
+++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
@@ -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;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v2 5/8] iio: st_sensors: Join string literals back
2020-03-13 10:49 ` [PATCH v2 5/8] iio: st_sensors: Join string literals back Andy Shevchenko
@ 2020-03-15 12:40 ` Jonathan Cameron
0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2020-03-15 12:40 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, Denis Ciocca
On Fri, 13 Mar 2020 12:49:52 +0200
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> For easy grepping on debug purposes join string literals back in
> the messages.
>
> No functional change.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied.
Thanks,
Jonathan
> ---
> v2: no 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(-)
>
> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
> index 804a9068e687..2e42838ca4f4 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_core.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_core.c
> @@ -277,8 +277,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;
> }
> diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
> index e817537cdfb5..0507283bd4c1 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
> @@ -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;
> }
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 6/8] iio: humidity: hts221: Use dev_get_platdata() to get platform_data
2020-03-13 10:49 [PATCH v2 1/8] iio: light: st_uvis25: Drop unneeded casting when print error code Andy Shevchenko
` (3 preceding siblings ...)
2020-03-13 10:49 ` [PATCH v2 5/8] iio: st_sensors: Join string literals back Andy Shevchenko
@ 2020-03-13 10:49 ` Andy Shevchenko
2020-03-15 12:42 ` Jonathan Cameron
2020-03-13 10:49 ` [PATCH v2 7/8] iio: humidity: hts221: Make use of device properties Andy Shevchenko
` (2 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Andy Shevchenko @ 2020-03-13 10:49 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio, Denis Ciocca
Cc: Andy Shevchenko
Use dev_get_platdata() to get the platform_data instead of
referencing it directly.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: new patch
drivers/iio/humidity/hts221_buffer.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/iio/humidity/hts221_buffer.c b/drivers/iio/humidity/hts221_buffer.c
index 81d50a861c22..5f142a44c1dd 100644
--- a/drivers/iio/humidity/hts221_buffer.c
+++ b/drivers/iio/humidity/hts221_buffer.c
@@ -74,10 +74,10 @@ static irqreturn_t hts221_trigger_handler_thread(int irq, void *private)
int hts221_allocate_trigger(struct hts221_hw *hw)
{
+ struct st_sensors_platform_data *pdata = dev_get_platdata(hw->dev);
struct iio_dev *iio_dev = iio_priv_to_dev(hw);
bool irq_active_low = false, open_drain = false;
struct device_node *np = hw->dev->of_node;
- struct st_sensors_platform_data *pdata;
unsigned long irq_type;
int err;
@@ -106,7 +106,6 @@ int hts221_allocate_trigger(struct hts221_hw *hw)
if (err < 0)
return err;
- pdata = (struct st_sensors_platform_data *)hw->dev->platform_data;
if ((np && of_property_read_bool(np, "drive-open-drain")) ||
(pdata && pdata->open_drain)) {
irq_type |= IRQF_SHARED;
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v2 6/8] iio: humidity: hts221: Use dev_get_platdata() to get platform_data
2020-03-13 10:49 ` [PATCH v2 6/8] iio: humidity: hts221: Use dev_get_platdata() to get platform_data Andy Shevchenko
@ 2020-03-15 12:42 ` Jonathan Cameron
0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2020-03-15 12:42 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, Denis Ciocca
On Fri, 13 Mar 2020 12:49:53 +0200
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> Use dev_get_platdata() to get the platform_data instead of
> referencing it directly.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied. Thanks,
Jonathan
> ---
> v2: new patch
> drivers/iio/humidity/hts221_buffer.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/iio/humidity/hts221_buffer.c b/drivers/iio/humidity/hts221_buffer.c
> index 81d50a861c22..5f142a44c1dd 100644
> --- a/drivers/iio/humidity/hts221_buffer.c
> +++ b/drivers/iio/humidity/hts221_buffer.c
> @@ -74,10 +74,10 @@ static irqreturn_t hts221_trigger_handler_thread(int irq, void *private)
>
> int hts221_allocate_trigger(struct hts221_hw *hw)
> {
> + struct st_sensors_platform_data *pdata = dev_get_platdata(hw->dev);
> struct iio_dev *iio_dev = iio_priv_to_dev(hw);
> bool irq_active_low = false, open_drain = false;
> struct device_node *np = hw->dev->of_node;
> - struct st_sensors_platform_data *pdata;
> unsigned long irq_type;
> int err;
>
> @@ -106,7 +106,6 @@ int hts221_allocate_trigger(struct hts221_hw *hw)
> if (err < 0)
> return err;
>
> - pdata = (struct st_sensors_platform_data *)hw->dev->platform_data;
> if ((np && of_property_read_bool(np, "drive-open-drain")) ||
> (pdata && pdata->open_drain)) {
> irq_type |= IRQF_SHARED;
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 7/8] iio: humidity: hts221: Make use of device properties
2020-03-13 10:49 [PATCH v2 1/8] iio: light: st_uvis25: Drop unneeded casting when print error code Andy Shevchenko
` (4 preceding siblings ...)
2020-03-13 10:49 ` [PATCH v2 6/8] iio: humidity: hts221: Use dev_get_platdata() to get platform_data Andy Shevchenko
@ 2020-03-13 10:49 ` Andy Shevchenko
2020-03-15 12:43 ` Jonathan Cameron
2020-03-13 10:49 ` [PATCH v2 8/8] iio: humidity: hts221: Drop unneeded casting when print error code Andy Shevchenko
2020-03-15 12:26 ` [PATCH v2 1/8] iio: light: st_uvis25: " Jonathan Cameron
7 siblings, 1 reply; 18+ messages in thread
From: Andy Shevchenko @ 2020-03-13 10:49 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio, Denis Ciocca
Cc: Andy Shevchenko
Device property API allows to gather device resources from different sources,
such as ACPI. Convert the drivers to unleash the power of device property API.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: new patch
drivers/iio/humidity/hts221_buffer.c | 3 +--
drivers/iio/humidity/hts221_i2c.c | 2 +-
drivers/iio/humidity/hts221_spi.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/humidity/hts221_buffer.c b/drivers/iio/humidity/hts221_buffer.c
index 5f142a44c1dd..9fb3f33614d4 100644
--- a/drivers/iio/humidity/hts221_buffer.c
+++ b/drivers/iio/humidity/hts221_buffer.c
@@ -77,7 +77,6 @@ int hts221_allocate_trigger(struct hts221_hw *hw)
struct st_sensors_platform_data *pdata = dev_get_platdata(hw->dev);
struct iio_dev *iio_dev = iio_priv_to_dev(hw);
bool irq_active_low = false, open_drain = false;
- struct device_node *np = hw->dev->of_node;
unsigned long irq_type;
int err;
@@ -106,7 +105,7 @@ int hts221_allocate_trigger(struct hts221_hw *hw)
if (err < 0)
return err;
- if ((np && of_property_read_bool(np, "drive-open-drain")) ||
+ if (device_property_read_bool(hw->dev, "drive-open-drain") ||
(pdata && pdata->open_drain)) {
irq_type |= IRQF_SHARED;
open_drain = true;
diff --git a/drivers/iio/humidity/hts221_i2c.c b/drivers/iio/humidity/hts221_i2c.c
index 4272b7030c44..1398794e4bc7 100644
--- a/drivers/iio/humidity/hts221_i2c.c
+++ b/drivers/iio/humidity/hts221_i2c.c
@@ -63,7 +63,7 @@ static struct i2c_driver hts221_driver = {
.driver = {
.name = "hts221_i2c",
.pm = &hts221_pm_ops,
- .of_match_table = of_match_ptr(hts221_i2c_of_match),
+ .of_match_table = hts221_i2c_of_match,
.acpi_match_table = ACPI_PTR(hts221_acpi_match),
},
.probe = hts221_i2c_probe,
diff --git a/drivers/iio/humidity/hts221_spi.c b/drivers/iio/humidity/hts221_spi.c
index 055dba8897d2..ba1115489c2c 100644
--- a/drivers/iio/humidity/hts221_spi.c
+++ b/drivers/iio/humidity/hts221_spi.c
@@ -56,7 +56,7 @@ static struct spi_driver hts221_driver = {
.driver = {
.name = "hts221_spi",
.pm = &hts221_pm_ops,
- .of_match_table = of_match_ptr(hts221_spi_of_match),
+ .of_match_table = hts221_spi_of_match,
},
.probe = hts221_spi_probe,
.id_table = hts221_spi_id_table,
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v2 7/8] iio: humidity: hts221: Make use of device properties
2020-03-13 10:49 ` [PATCH v2 7/8] iio: humidity: hts221: Make use of device properties Andy Shevchenko
@ 2020-03-15 12:43 ` Jonathan Cameron
0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2020-03-15 12:43 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, Denis Ciocca
On Fri, 13 Mar 2020 12:49:54 +0200
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> Device property API allows to gather device resources from different sources,
> such as ACPI. Convert the drivers to unleash the power of device property API.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied.
Thanks,
Jonathan
> ---
> v2: new patch
> drivers/iio/humidity/hts221_buffer.c | 3 +--
> drivers/iio/humidity/hts221_i2c.c | 2 +-
> drivers/iio/humidity/hts221_spi.c | 2 +-
> 3 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/humidity/hts221_buffer.c b/drivers/iio/humidity/hts221_buffer.c
> index 5f142a44c1dd..9fb3f33614d4 100644
> --- a/drivers/iio/humidity/hts221_buffer.c
> +++ b/drivers/iio/humidity/hts221_buffer.c
> @@ -77,7 +77,6 @@ int hts221_allocate_trigger(struct hts221_hw *hw)
> struct st_sensors_platform_data *pdata = dev_get_platdata(hw->dev);
> struct iio_dev *iio_dev = iio_priv_to_dev(hw);
> bool irq_active_low = false, open_drain = false;
> - struct device_node *np = hw->dev->of_node;
> unsigned long irq_type;
> int err;
>
> @@ -106,7 +105,7 @@ int hts221_allocate_trigger(struct hts221_hw *hw)
> if (err < 0)
> return err;
>
> - if ((np && of_property_read_bool(np, "drive-open-drain")) ||
> + if (device_property_read_bool(hw->dev, "drive-open-drain") ||
> (pdata && pdata->open_drain)) {
> irq_type |= IRQF_SHARED;
> open_drain = true;
> diff --git a/drivers/iio/humidity/hts221_i2c.c b/drivers/iio/humidity/hts221_i2c.c
> index 4272b7030c44..1398794e4bc7 100644
> --- a/drivers/iio/humidity/hts221_i2c.c
> +++ b/drivers/iio/humidity/hts221_i2c.c
> @@ -63,7 +63,7 @@ static struct i2c_driver hts221_driver = {
> .driver = {
> .name = "hts221_i2c",
> .pm = &hts221_pm_ops,
> - .of_match_table = of_match_ptr(hts221_i2c_of_match),
> + .of_match_table = hts221_i2c_of_match,
> .acpi_match_table = ACPI_PTR(hts221_acpi_match),
> },
> .probe = hts221_i2c_probe,
> diff --git a/drivers/iio/humidity/hts221_spi.c b/drivers/iio/humidity/hts221_spi.c
> index 055dba8897d2..ba1115489c2c 100644
> --- a/drivers/iio/humidity/hts221_spi.c
> +++ b/drivers/iio/humidity/hts221_spi.c
> @@ -56,7 +56,7 @@ static struct spi_driver hts221_driver = {
> .driver = {
> .name = "hts221_spi",
> .pm = &hts221_pm_ops,
> - .of_match_table = of_match_ptr(hts221_spi_of_match),
> + .of_match_table = hts221_spi_of_match,
> },
> .probe = hts221_spi_probe,
> .id_table = hts221_spi_id_table,
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 8/8] iio: humidity: hts221: Drop unneeded casting when print error code
2020-03-13 10:49 [PATCH v2 1/8] iio: light: st_uvis25: Drop unneeded casting when print error code Andy Shevchenko
` (5 preceding siblings ...)
2020-03-13 10:49 ` [PATCH v2 7/8] iio: humidity: hts221: Make use of device properties Andy Shevchenko
@ 2020-03-13 10:49 ` Andy Shevchenko
2020-03-15 12:44 ` Jonathan Cameron
2020-03-15 12:26 ` [PATCH v2 1/8] iio: light: st_uvis25: " Jonathan Cameron
7 siblings, 1 reply; 18+ messages in thread
From: Andy Shevchenko @ 2020-03-13 10:49 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio, Denis Ciocca
Cc: Andy Shevchenko
Explicit casting in printf() usually shows that something is not okay.
Here, we really don't need it by providing correct specifier.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: new patch
drivers/iio/humidity/hts221_i2c.c | 4 ++--
drivers/iio/humidity/hts221_spi.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/humidity/hts221_i2c.c b/drivers/iio/humidity/hts221_i2c.c
index 1398794e4bc7..cab39c4756f8 100644
--- a/drivers/iio/humidity/hts221_i2c.c
+++ b/drivers/iio/humidity/hts221_i2c.c
@@ -32,8 +32,8 @@ static int hts221_i2c_probe(struct i2c_client *client,
regmap = devm_regmap_init_i2c(client, &hts221_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);
}
diff --git a/drivers/iio/humidity/hts221_spi.c b/drivers/iio/humidity/hts221_spi.c
index ba1115489c2c..729e86e433b1 100644
--- a/drivers/iio/humidity/hts221_spi.c
+++ b/drivers/iio/humidity/hts221_spi.c
@@ -31,8 +31,8 @@ static int hts221_spi_probe(struct spi_device *spi)
regmap = devm_regmap_init_spi(spi, &hts221_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);
}
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH v2 8/8] iio: humidity: hts221: Drop unneeded casting when print error code
2020-03-13 10:49 ` [PATCH v2 8/8] iio: humidity: hts221: Drop unneeded casting when print error code Andy Shevchenko
@ 2020-03-15 12:44 ` Jonathan Cameron
2020-03-16 8:27 ` Andy Shevchenko
0 siblings, 1 reply; 18+ messages in thread
From: Jonathan Cameron @ 2020-03-15 12:44 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, Denis Ciocca
On Fri, 13 Mar 2020 12:49:55 +0200
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> Explicit casting in printf() usually shows that something is not okay.
> Here, we really don't need it by providing correct specifier.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied. These may sit in my local tree for a few days as I have
an existing pull request out and will want to fast-forward the
tree after that.
Thanks,
Jonathan
> ---
> v2: new patch
> drivers/iio/humidity/hts221_i2c.c | 4 ++--
> drivers/iio/humidity/hts221_spi.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/humidity/hts221_i2c.c b/drivers/iio/humidity/hts221_i2c.c
> index 1398794e4bc7..cab39c4756f8 100644
> --- a/drivers/iio/humidity/hts221_i2c.c
> +++ b/drivers/iio/humidity/hts221_i2c.c
> @@ -32,8 +32,8 @@ static int hts221_i2c_probe(struct i2c_client *client,
>
> regmap = devm_regmap_init_i2c(client, &hts221_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);
> }
>
> diff --git a/drivers/iio/humidity/hts221_spi.c b/drivers/iio/humidity/hts221_spi.c
> index ba1115489c2c..729e86e433b1 100644
> --- a/drivers/iio/humidity/hts221_spi.c
> +++ b/drivers/iio/humidity/hts221_spi.c
> @@ -31,8 +31,8 @@ static int hts221_spi_probe(struct spi_device *spi)
>
> regmap = devm_regmap_init_spi(spi, &hts221_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);
> }
>
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH v2 8/8] iio: humidity: hts221: Drop unneeded casting when print error code
2020-03-15 12:44 ` Jonathan Cameron
@ 2020-03-16 8:27 ` Andy Shevchenko
0 siblings, 0 replies; 18+ messages in thread
From: Andy Shevchenko @ 2020-03-16 8:27 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, Denis Ciocca
On Sun, Mar 15, 2020 at 12:44:51PM +0000, Jonathan Cameron wrote:
> On Fri, 13 Mar 2020 12:49:55 +0200
> Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
>
> > Explicit casting in printf() usually shows that something is not okay.
> > Here, we really don't need it by providing correct specifier.
> >
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Applied. These may sit in my local tree for a few days as I have
> an existing pull request out and will want to fast-forward the
> tree after that.
It's fine, thank you, Jonathan.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 1/8] iio: light: st_uvis25: Drop unneeded casting when print error code
2020-03-13 10:49 [PATCH v2 1/8] iio: light: st_uvis25: Drop unneeded casting when print error code Andy Shevchenko
` (6 preceding siblings ...)
2020-03-13 10:49 ` [PATCH v2 8/8] iio: humidity: hts221: Drop unneeded casting when print error code Andy Shevchenko
@ 2020-03-15 12:26 ` Jonathan Cameron
2020-03-15 12:31 ` Jonathan Cameron
7 siblings, 1 reply; 18+ messages in thread
From: Jonathan Cameron @ 2020-03-15 12:26 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, Denis Ciocca
On Fri, 13 Mar 2020 12:49:48 +0200
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> Explicit casting in printf() usually shows that something is not okay.
> Here, we really don't need it by providing correct specifier.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied to the togreg branch of iio.git.
thanks,
Jonathan
> ---
> v2: no change
> drivers/iio/light/st_uvis25_i2c.c | 4 ++--
> drivers/iio/light/st_uvis25_spi.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/light/st_uvis25_i2c.c b/drivers/iio/light/st_uvis25_i2c.c
> index 4889bbeb0c73..400724069d19 100644
> --- a/drivers/iio/light/st_uvis25_i2c.c
> +++ b/drivers/iio/light/st_uvis25_i2c.c
> @@ -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);
> }
>
> diff --git a/drivers/iio/light/st_uvis25_spi.c b/drivers/iio/light/st_uvis25_spi.c
> index a9ceae4f58b3..cd3761a3ee3f 100644
> --- a/drivers/iio/light/st_uvis25_spi.c
> +++ b/drivers/iio/light/st_uvis25_spi.c
> @@ -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);
> }
>
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH v2 1/8] iio: light: st_uvis25: Drop unneeded casting when print error code
2020-03-15 12:26 ` [PATCH v2 1/8] iio: light: st_uvis25: " Jonathan Cameron
@ 2020-03-15 12:31 ` Jonathan Cameron
0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2020-03-15 12:31 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, Denis Ciocca, Rohit Sarkar, Nishant Malpani
On Sun, 15 Mar 2020 12:26:09 +0000
Jonathan Cameron <jic23@kernel.org> wrote:
> On Fri, 13 Mar 2020 12:49:48 +0200
> Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
>
> > Explicit casting in printf() usually shows that something is not okay.
> > Here, we really don't need it by providing correct specifier.
> >
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Applied to the togreg branch of iio.git.
>
+CC Rohit and Nishant
On that note. Cleaning other cases of this out sounds like good and
useful work for those who have asked recently.
git grep -A 4 dev_err -- drivers/iio/ | grep \(int\)
Gives a few likely places to look.
If not I'll sweep up the lot in a week or so as clearly been some
cut and paste going on here and I'd rather it didn't happen again.
Thanks,
Jonathan
> thanks,
>
> Jonathan
>
> > ---
> > v2: no change
> > drivers/iio/light/st_uvis25_i2c.c | 4 ++--
> > drivers/iio/light/st_uvis25_spi.c | 4 ++--
> > 2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/iio/light/st_uvis25_i2c.c b/drivers/iio/light/st_uvis25_i2c.c
> > index 4889bbeb0c73..400724069d19 100644
> > --- a/drivers/iio/light/st_uvis25_i2c.c
> > +++ b/drivers/iio/light/st_uvis25_i2c.c
> > @@ -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);
> > }
> >
> > diff --git a/drivers/iio/light/st_uvis25_spi.c b/drivers/iio/light/st_uvis25_spi.c
> > index a9ceae4f58b3..cd3761a3ee3f 100644
> > --- a/drivers/iio/light/st_uvis25_spi.c
> > +++ b/drivers/iio/light/st_uvis25_spi.c
> > @@ -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);
> > }
> >
>
^ permalink raw reply [flat|nested] 18+ messages in thread