Skip to contentSkip to conversation

iio: light: st_uvis25: Drop unneeded casting when print error code

PATCH Applied Andy Shevchenko 2 participants 18 messages Mar 13, 2020 – Mar 16, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/8 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.

---
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(-)
drivers/iio/light/st_uvis25_i2c.c +2 -2
index 4889bbeb0c73..400724069d19 100644
@@ -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
index a9ceae4f58b3..cd3761a3ee3f 100644
@@ -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
#1 lore raw

PATCH v2 2/8 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.

---
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(-)
drivers/iio/accel/st_accel_core.c +1 -2
index 7320275c7e56..5f7bdb1f55d1 100644
@@ -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
index 1275fb0eda31..dcbdef4a77f8 100644
@@ -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
index bd972cec4830..8bb47c3b4d6b 100644
@@ -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
#5 lore raw

PATCH v2 4/8 iio: st_sensors: Drop unneeded casting when print error code

In reply to Andy Shevchenko

Explicit casting in printf() usually shows that something is not okay. Here, we really don't need it by providing correct specifier.

---
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(-)
drivers/iio/common/st_sensors/st_sensors_i2c.c +2 -2
index 286830fb5d35..b400560bac93 100644
@@ -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
index dcbdef4a77f8..ee70515bb89f 100644
@@ -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
#3 lore raw

PATCH v2 3/8 iio: st_sensors: Drop unneeded explicit castings

In reply to Andy Shevchenko

In few places the unnecessary explicit castings are being used. Drop them for good.

---
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(-)
drivers/iio/accel/st_accel_buffer.c +1 -2
index 9f2b40474b8e..b5c814ef1637 100644
@@ -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/accel/st_accel_core.c +1 -2
index 5f7bdb1f55d1..e2ec5d127495 100644
@@ -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)
drivers/iio/common/st_sensors/st_sensors_core.c +1 -2
index e051edbc43c1..804a9068e687 100644
@@ -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:
drivers/iio/gyro/st_gyro_buffer.c +1 -2
index 7465ad62391c..9c92ff7a82be 100644
@@ -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
index 26c50b24bc08..c8aa051995d3 100644
@@ -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/magnetometer/st_magn_core.c +1 -2
index e68184a93a6d..79de721e6015 100644
@@ -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);
drivers/iio/pressure/st_pressure_core.c +1 -3
index 8bb47c3b4d6b..789a2928504a 100644
@@ -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
#7 lore raw

PATCH v2 5/8 iio: st_sensors: Join string literals back

In reply to Andy Shevchenko

For easy grepping on debug purposes join string literals back in the messages.

No functional change.

---
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(-)
drivers/iio/common/st_sensors/st_sensors_core.c +1 -2
index 804a9068e687..2e42838ca4f4 100644
@@ -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;
 	}
drivers/iio/common/st_sensors/st_sensors_trigger.c +4 -9
index e817537cdfb5..0507283bd4c1 100644
@@ -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
#9 lore raw

PATCH v2 6/8 iio: humidity: hts221: Use dev_get_platdata() to get platform_data

In reply to Andy Shevchenko

Use dev_get_platdata() to get the platform_data instead of referencing it directly.

---
v2: new patch

 drivers/iio/humidity/hts221_buffer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iio/humidity/hts221_buffer.c +1 -2
index 81d50a861c22..5f142a44c1dd 100644
@@ -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;
Signature · 1 line
2.25.1
#11 lore raw

PATCH v2 7/8 iio: humidity: hts221: Make use of device properties

In reply to 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.

---
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(-)
drivers/iio/humidity/hts221_buffer.c +1 -2
index 5f142a44c1dd..9fb3f33614d4 100644
@@ -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;
drivers/iio/humidity/hts221_i2c.c +1 -1
index 4272b7030c44..1398794e4bc7 100644
@@ -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,
drivers/iio/humidity/hts221_spi.c +1 -1
index 055dba8897d2..ba1115489c2c 100644
@@ -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,
Signature · 1 line
2.25.1
#13 lore raw

PATCH v2 8/8 iio: humidity: hts221: Drop unneeded casting when print error code

In reply to Andy Shevchenko

Explicit casting in printf() usually shows that something is not okay. Here, we really don't need it by providing correct specifier.

---
v2: new patch

 drivers/iio/humidity/hts221_i2c.c | 4 ++--
 drivers/iio/humidity/hts221_spi.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/iio/humidity/hts221_i2c.c +2 -2
index 1398794e4bc7..cab39c4756f8 100644
@@ -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);
 	}
 
drivers/iio/humidity/hts221_spi.c +2 -2
index ba1115489c2c..729e86e433b1 100644
@@ -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);
 	}
 
Signature · 1 line
2.25.1
maintainer Applied
#16 lore raw
In reply to Andy Shevchenko
Quoted 4 lines · On Fri, 13 Mar 2020 12:49:48 +0200 Andy Shevchenko…

Explicit casting in printf() usually shows that something is not okay. Here, we really don't need it by providing correct specifier.

Applied to the togreg branch of iio.git.

thanks,

Jonathan

Quoted 36 lines

---
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(-)
drivers/iio/light/st_uvis25_i2c.c +2 -2
index 4889bbeb0c73..400724069d19 100644
@@ -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
index a9ceae4f58b3..cd3761a3ee3f 100644
@@ -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);
 	}
 
maintainer
#17 lore raw
Quoted 9 lines · On Sun, 15 Mar 2020 12:26:09 +0000 Jonathan Cameron <[email protected]> wrote:
Quoted 4 lines · On Fri, 13 Mar 2020 12:49:48 +0200 Andy Shevchenko…

Explicit casting in printf() usually shows that something is not okay. Here, we really don't need it by providing correct specifier.

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

Quoted 41 lines

thanks,

Jonathan

Quoted 36 lines

---
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(-)
drivers/iio/light/st_uvis25_i2c.c +2 -2
index 4889bbeb0c73..400724069d19 100644
@@ -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
index a9ceae4f58b3..cd3761a3ee3f 100644
@@ -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);
 	}
 
maintainer Applied
#2 lore raw

Re: [PATCH v2 2/8] iio: st_sensors: Use dev_get_platdata() to get platform_data

In reply to Andy Shevchenko
Quoted 4 lines · On Fri, 13 Mar 2020 12:49:49 +0200 Andy Shevchenko…

Use dev_get_platdata() to get the platform_data instead of referencing it directly.

Applied. Thanks,

Jonathan

Quoted 48 lines

---
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(-)
drivers/iio/accel/st_accel_core.c +1 -2
index 7320275c7e56..5f7bdb1f55d1 100644
@@ -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
index 1275fb0eda31..dcbdef4a77f8 100644
@@ -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
index bd972cec4830..8bb47c3b4d6b 100644
@@ -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;
maintainer Applied
#4 lore raw

Re: [PATCH v2 3/8] iio: st_sensors: Drop unneeded explicit castings

In reply to Andy Shevchenko
Quoted 4 lines · On Fri, 13 Mar 2020 12:49:50 +0200 Andy Shevchenko…

In few places the unnecessary explicit castings are being used. Drop them for good.

Applied. Thanks,

Jonathan

Quoted 125 lines

---
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(-)
drivers/iio/accel/st_accel_buffer.c +1 -2
index 9f2b40474b8e..b5c814ef1637 100644
@@ -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/accel/st_accel_core.c +1 -2
index 5f7bdb1f55d1..e2ec5d127495 100644
@@ -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)
drivers/iio/common/st_sensors/st_sensors_core.c +1 -2
index e051edbc43c1..804a9068e687 100644
@@ -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:
drivers/iio/gyro/st_gyro_buffer.c +1 -2
index 7465ad62391c..9c92ff7a82be 100644
@@ -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
index 26c50b24bc08..c8aa051995d3 100644
@@ -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/magnetometer/st_magn_core.c +1 -2
index e68184a93a6d..79de721e6015 100644
@@ -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);
drivers/iio/pressure/st_pressure_core.c +1 -3
index 8bb47c3b4d6b..789a2928504a 100644
@@ -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;
 
maintainer Applied
#6 lore raw

Re: [PATCH v2 4/8] iio: st_sensors: Drop unneeded casting when print error code

In reply to Andy Shevchenko
Quoted 4 lines · On Fri, 13 Mar 2020 12:49:51 +0200 Andy Shevchenko…

Explicit casting in printf() usually shows that something is not okay. Here, we really don't need it by providing correct specifier.

applied, thanks.

Jonathan

Quoted 36 lines

---
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(-)
drivers/iio/common/st_sensors/st_sensors_i2c.c +2 -2
index 286830fb5d35..b400560bac93 100644
@@ -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
index dcbdef4a77f8..ee70515bb89f 100644
@@ -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);
 	}
 
maintainer Applied
#8 lore raw

Re: [PATCH v2 5/8] iio: st_sensors: Join string literals back

In reply to Andy Shevchenko
Quoted 6 lines · On Fri, 13 Mar 2020 12:49:52 +0200 Andy Shevchenko…

For easy grepping on debug purposes join string literals back in the messages.

No functional change.

Applied.

Thanks,

Jonathan

Quoted 65 lines

---
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(-)
drivers/iio/common/st_sensors/st_sensors_core.c +1 -2
index 804a9068e687..2e42838ca4f4 100644
@@ -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;
 	}
drivers/iio/common/st_sensors/st_sensors_trigger.c +4 -9
index e817537cdfb5..0507283bd4c1 100644
@@ -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;
 	}
 
maintainer Applied
#10 lore raw

Re: [PATCH v2 6/8] iio: humidity: hts221: Use dev_get_platdata() to get platform_data

In reply to Andy Shevchenko
Quoted 4 lines · On Fri, 13 Mar 2020 12:49:53 +0200 Andy Shevchenko…

Use dev_get_platdata() to get the platform_data instead of referencing it directly.

Applied. Thanks,

Jonathan

Quoted 29 lines

---
v2: new patch

 drivers/iio/humidity/hts221_buffer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iio/humidity/hts221_buffer.c +1 -2
index 81d50a861c22..5f142a44c1dd 100644
@@ -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;
maintainer Applied
#12 lore raw

Re: [PATCH v2 7/8] iio: humidity: hts221: Make use of device properties

In reply to Andy Shevchenko
Quoted 4 lines · On Fri, 13 Mar 2020 12:49:54 +0200 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.

Applied.

Thanks,

Jonathan

Quoted 54 lines

---
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(-)
drivers/iio/humidity/hts221_buffer.c +1 -2
index 5f142a44c1dd..9fb3f33614d4 100644
@@ -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;
drivers/iio/humidity/hts221_i2c.c +1 -1
index 4272b7030c44..1398794e4bc7 100644
@@ -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,
drivers/iio/humidity/hts221_spi.c +1 -1
index 055dba8897d2..ba1115489c2c 100644
@@ -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,
maintainer
#14 lore raw

Re: [PATCH v2 8/8] iio: humidity: hts221: Drop unneeded casting when print error code

In reply to Andy Shevchenko
Quoted 4 lines · On Fri, 13 Mar 2020 12:49:55 +0200 Andy Shevchenko…

Explicit casting in printf() usually shows that something is not okay. Here, we really don't need it by providing correct specifier.

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

Quoted 36 lines

---
v2: new patch

 drivers/iio/humidity/hts221_i2c.c | 4 ++--
 drivers/iio/humidity/hts221_spi.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/iio/humidity/hts221_i2c.c +2 -2
index 1398794e4bc7..cab39c4756f8 100644
@@ -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);
 	}
 
drivers/iio/humidity/hts221_spi.c +2 -2
index ba1115489c2c..729e86e433b1 100644
@@ -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);
 	}
 
#15 lore raw

Re: [PATCH v2 8/8] iio: humidity: hts221: Drop unneeded casting when print error code

Quoted 10 lines · Jonathan Cameron
Quoted 4 lines · On Fri, 13 Mar 2020 12:49:55 +0200 Andy Shevchenko…

Explicit casting in printf() usually shows that something is not okay. Here, we really don't need it by providing correct specifier.

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.

Signature · 2 lines
With Best Regards,
Andy Shevchenko