Skip to contentSkip to conversation

iio: proximity: sx_common: Allow IIO core to take care of firmware node

PATCH In review Andy Shevchenko 4 participants 5 messages May 30, 2022 – Jun 14, 2022 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: proximity: sx_common: Allow IIO core to take care of firmware node

IIO core correctly will take care of firmware node if it's not set in the driver. Drop ACPI and OF specifics from the driver and allow IIO core to handle this.

---
 drivers/iio/proximity/sx_common.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/iio/proximity/sx_common.c +0 -3
index 8ad814d96b7e..6bb68c1835da 100644
@@ -5,7 +5,6 @@
  * Common part of most Semtech SAR sensor.
  */
 
-#include <linux/acpi.h>
 #include <linux/bitops.h>
 #include <linux/byteorder/generic.h>
 #include <linux/delay.h>
@@ -520,8 +519,6 @@ int sx_common_probe(struct i2c_client *client,
 	if (ret)
 		return dev_err_probe(dev, ret, "error reading WHOAMI\n");
 
-	ACPI_COMPANION_SET(&indio_dev->dev, ACPI_COMPANION(dev));
-	indio_dev->dev.of_node = client->dev.of_node;
 	indio_dev->modes = INDIO_DIRECT_MODE;
 
 	indio_dev->channels =  data->chip_info->iio_channels;
Signature · 1 line
2.35.1
maintainer
#1 lore raw
Quoted 5 lines · On Mon, 30 May 2022 20:43:26 +0300 Andy Shevchenko…

IIO core correctly will take care of firmware node if it's not set in the driver. Drop ACPI and OF specifics from the driver and allow IIO core to handle this.

Looks fine to me. As such I'll apply it now, but Gwendal, you've been active with this driver recently so if you have time to sanity check that would be great. Once I've caught up with new stuff I plan to check where we are with your various series on this driver.

Thanks,

Jonathan

Quoted 25 lines
---
 drivers/iio/proximity/sx_common.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/iio/proximity/sx_common.c +0 -3
index 8ad814d96b7e..6bb68c1835da 100644
@@ -5,7 +5,6 @@
  * Common part of most Semtech SAR sensor.
  */
 
-#include <linux/acpi.h>
 #include <linux/bitops.h>
 #include <linux/byteorder/generic.h>
 #include <linux/delay.h>
@@ -520,8 +519,6 @@ int sx_common_probe(struct i2c_client *client,
 	if (ret)
 		return dev_err_probe(dev, ret, "error reading WHOAMI\n");
 
-	ACPI_COMPANION_SET(&indio_dev->dev, ACPI_COMPANION(dev));
-	indio_dev->dev.of_node = client->dev.of_node;
 	indio_dev->modes = INDIO_DIRECT_MODE;
 
 	indio_dev->channels =  data->chip_info->iio_channels;
#2 lore raw

The reason we have the code ACPI_COMPANION_SET and dev.of_node set (by commit 74a53a959028e ("iio:proximity:sx_common: Fix device property parsing on DT systems") from Stephen is we are getting device propery in ->get_default_reg(), which is called in sx_common_init_device(), before devm_iio_device_register().

We have the same code path in other driver, like adc/stm32-adc.c, where indio_dev->dev.of_node is set manually to be able to set the resolution based on device tree properties.

Gwendal.

Quoted 44 lines · Jonathan Cameron
Quoted 5 lines · On Mon, 30 May 2022 20:43:26 +0300 Andy Shevchenko…

IIO core correctly will take care of firmware node if it's not set in the driver. Drop ACPI and OF specifics from the driver and allow IIO core to handle this.

Looks fine to me. As such I'll apply it now, but Gwendal, you've been active with this driver recently so if you have time to sanity check that would be great. Once I've caught up with new stuff I plan to check where we are with your various series on this driver.

Thanks,

Jonathan

Quoted 25 lines
---
 drivers/iio/proximity/sx_common.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/iio/proximity/sx_common.c +0 -3
index 8ad814d96b7e..6bb68c1835da 100644
@@ -5,7 +5,6 @@
  * Common part of most Semtech SAR sensor.
  */
 
-#include <linux/acpi.h>
 #include <linux/bitops.h>
 #include <linux/byteorder/generic.h>
 #include <linux/delay.h>
@@ -520,8 +519,6 @@ int sx_common_probe(struct i2c_client *client,
      if (ret)
              return dev_err_probe(dev, ret, "error reading WHOAMI\n");
 
-     ACPI_COMPANION_SET(&indio_dev->dev, ACPI_COMPANION(dev));
-     indio_dev->dev.of_node = client->dev.of_node;
      indio_dev->modes = INDIO_DIRECT_MODE;
 
      indio_dev->channels =  data->chip_info->iio_channels;
#3 lore raw
Quoted 10 lines · Gwendal Grignou

The reason we have the code ACPI_COMPANION_SET and dev.of_node set (by commit 74a53a959028e ("iio:proximity:sx_common: Fix device property parsing on DT systems") from Stephen is we are getting device propery in ->get_default_reg(), which is called in sx_common_init_device(), before devm_iio_device_register().

We have the same code path in other driver, like adc/stm32-adc.c, where indio_dev->dev.of_node is set manually to be able to set the resolution based on device tree properties.

Ah, thanks for this insight! I will rework the patch accordingly (yes, there is something to clean up even in this case).

Quoted 13 lines · Jonathan Cameron
Quoted 12 lines
Quoted 5 lines · On Mon, 30 May 2022 20:43:26 +0300 Andy Shevchenko…

IIO core correctly will take care of firmware node if it's not set in the driver. Drop ACPI and OF specifics from the driver and allow IIO core to handle this.

Looks fine to me. As such I'll apply it now, but Gwendal, you've been active with this driver recently so if you have time to sanity check that would be great. Once I've caught up with new stuff I plan to check where we are with your various series on this driver.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#4 lore raw
Quoted 8 lines · On Tue, 14 Jun 2022 11:27:21 +0200 Andy Shevchenko <[email protected]>…
Quoted 7 lines · Gwendal Grignou

The reason we have the code ACPI_COMPANION_SET and dev.of_node set (by commit 74a53a959028e ("iio:proximity:sx_common: Fix device property parsing on DT systems") from Stephen is we are getting device propery in ->get_default_reg(), which is called in sx_common_init_device(), before devm_iio_device_register().

Quoted 21 lines
Quoted 3 lines

We have the same code path in other driver, like adc/stm32-adc.c, where indio_dev->dev.of_node is set manually to be able to set the resolution based on device tree properties.

Ah, thanks for this insight! I will rework the patch accordingly (yes, there is something to clean up even in this case).

Quoted 13 lines · Jonathan Cameron
Quoted 12 lines
Quoted 5 lines · On Mon, 30 May 2022 20:43:26 +0300 Andy Shevchenko…

IIO core correctly will take care of firmware node if it's not set in the driver. Drop ACPI and OF specifics from the driver and allow IIO core to handle this.

Looks fine to me. As such I'll apply it now, but Gwendal, you've been active with this driver recently so if you have time to sanity check that would be great. Once I've caught up with new stuff I plan to check where we are with your various series on this driver.

Dropped patch