diff mbox series

[v2,1/1] iio: imu: bmi160: Make use of device properties

Message ID 20220414131804.25227-1-andriy.shevchenko@linux.intel.com (mailing list archive)
State Accepted
Headers show
Series [v2,1/1] iio: imu: bmi160: Make use of device properties | expand

Commit Message

Andy Shevchenko April 14, 2022, 1:18 p.m. UTC 
Convert the module to be property provider agnostic and allow
it to be used on non-OF platforms.

While at it, reuse temporary device pointer in the same function.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: fixed subject to use proper part number in it
 drivers/iio/imu/bmi160/bmi160_core.c | 27 ++++++---------------------
 drivers/iio/imu/bmi160/bmi160_i2c.c  | 13 ++++++-------
 drivers/iio/imu/bmi160/bmi160_spi.c  | 18 +++++++++++-------
 3 files changed, 23 insertions(+), 35 deletions(-)

Comments

Jonathan Cameron April 15, 2022, 6:19 p.m. UTC | #1 
On Thu, 14 Apr 2022 16:18:04 +0300
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:

> Convert the module to be property provider agnostic and allow
> it to be used on non-OF platforms.
> 
> While at it, reuse temporary device pointer in the same function.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Gah.  Can't argue with the patch as it's definitely an improvement, but
dev_name() was never the right thing to do if we couldn't get
the part name more directly. That field is supposed to be a chip
part number which dev_name is very unlikely to be!

Ah well - it's userspace ABI so not much we can do about it now...

Hence applied to the togreg branch of iio.git.  Note I'll not
be pushing that out as non rebasing for a few days so time
for others to review if they wish.

Thanks,

Jonathan

> ---
> v2: fixed subject to use proper part number in it
>  drivers/iio/imu/bmi160/bmi160_core.c | 27 ++++++---------------------
>  drivers/iio/imu/bmi160/bmi160_i2c.c  | 13 ++++++-------
>  drivers/iio/imu/bmi160/bmi160_spi.c  | 18 +++++++++++-------
>  3 files changed, 23 insertions(+), 35 deletions(-)
> 
> diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
> index 01336105792e..e7aec56ea136 100644
> --- a/drivers/iio/imu/bmi160/bmi160_core.c
> +++ b/drivers/iio/imu/bmi160/bmi160_core.c
> @@ -11,10 +11,9 @@
>   */
>  #include <linux/module.h>
>  #include <linux/regmap.h>
> -#include <linux/acpi.h>
>  #include <linux/delay.h>
>  #include <linux/irq.h>
> -#include <linux/of_irq.h>
> +#include <linux/property.h>
>  #include <linux/regulator/consumer.h>
>  
>  #include <linux/iio/iio.h>
> @@ -525,17 +524,6 @@ static const struct iio_info bmi160_info = {
>  	.attrs = &bmi160_attrs_group,
>  };
>  
> -static const char *bmi160_match_acpi_device(struct device *dev)
> -{
> -	const struct acpi_device_id *id;
> -
> -	id = acpi_match_device(dev->driver->acpi_match_table, dev);
> -	if (!id)
> -		return NULL;
> -
> -	return dev_name(dev);
> -}
> -
>  static int bmi160_write_conf_reg(struct regmap *regmap, unsigned int reg,
>  				 unsigned int mask, unsigned int bits,
>  				 unsigned int write_usleep)
> @@ -647,18 +635,18 @@ int bmi160_enable_irq(struct regmap *regmap, bool enable)
>  }
>  EXPORT_SYMBOL(bmi160_enable_irq);
>  
> -static int bmi160_get_irq(struct device_node *of_node, enum bmi160_int_pin *pin)
> +static int bmi160_get_irq(struct fwnode_handle *fwnode, enum bmi160_int_pin *pin)
>  {
>  	int irq;
>  
>  	/* Use INT1 if possible, otherwise fall back to INT2. */
> -	irq = of_irq_get_byname(of_node, "INT1");
> +	irq = fwnode_irq_get_byname(fwnode, "INT1");
>  	if (irq > 0) {
>  		*pin = BMI160_PIN_INT1;
>  		return irq;
>  	}
>  
> -	irq = of_irq_get_byname(of_node, "INT2");
> +	irq = fwnode_irq_get_byname(fwnode, "INT2");
>  	if (irq > 0)
>  		*pin = BMI160_PIN_INT2;
>  
> @@ -688,7 +676,7 @@ static int bmi160_config_device_irq(struct iio_dev *indio_dev, int irq_type,
>  		return -EINVAL;
>  	}
>  
> -	open_drain = of_property_read_bool(dev->of_node, "drive-open-drain");
> +	open_drain = device_property_read_bool(dev, "drive-open-drain");
>  
>  	return bmi160_config_pin(data->regmap, pin, open_drain, irq_mask,
>  				 BMI160_NORMAL_WRITE_USLEEP);
> @@ -872,9 +860,6 @@ int bmi160_core_probe(struct device *dev, struct regmap *regmap,
>  	if (ret)
>  		return ret;
>  
> -	if (!name && ACPI_HANDLE(dev))
> -		name = bmi160_match_acpi_device(dev);
> -
>  	indio_dev->channels = bmi160_channels;
>  	indio_dev->num_channels = ARRAY_SIZE(bmi160_channels);
>  	indio_dev->name = name;
> @@ -887,7 +872,7 @@ int bmi160_core_probe(struct device *dev, struct regmap *regmap,
>  	if (ret)
>  		return ret;
>  
> -	irq = bmi160_get_irq(dev->of_node, &int_pin);
> +	irq = bmi160_get_irq(dev_fwnode(dev), &int_pin);
>  	if (irq > 0) {
>  		ret = bmi160_setup_irq(indio_dev, irq, int_pin);
>  		if (ret)
> diff --git a/drivers/iio/imu/bmi160/bmi160_i2c.c b/drivers/iio/imu/bmi160/bmi160_i2c.c
> index 26398614eddf..02f149d37b17 100644
> --- a/drivers/iio/imu/bmi160/bmi160_i2c.c
> +++ b/drivers/iio/imu/bmi160/bmi160_i2c.c
> @@ -8,10 +8,9 @@
>   *      - 0x68 if SDO is pulled to GND
>   *      - 0x69 if SDO is pulled to VDDIO
>   */
> -#include <linux/acpi.h>
>  #include <linux/i2c.h>
> +#include <linux/mod_devicetable.h>
>  #include <linux/module.h>
> -#include <linux/of.h>
>  #include <linux/regmap.h>
>  
>  #include "bmi160.h"
> @@ -20,7 +19,7 @@ static int bmi160_i2c_probe(struct i2c_client *client,
>  			    const struct i2c_device_id *id)
>  {
>  	struct regmap *regmap;
> -	const char *name = NULL;
> +	const char *name;
>  
>  	regmap = devm_regmap_init_i2c(client, &bmi160_regmap_config);
>  	if (IS_ERR(regmap)) {
> @@ -31,6 +30,8 @@ static int bmi160_i2c_probe(struct i2c_client *client,
>  
>  	if (id)
>  		name = id->name;
> +	else
> +		name = dev_name(&client->dev);
>  
>  	return bmi160_core_probe(&client->dev, regmap, name, false);
>  }
> @@ -47,19 +48,17 @@ static const struct acpi_device_id bmi160_acpi_match[] = {
>  };
>  MODULE_DEVICE_TABLE(acpi, bmi160_acpi_match);
>  
> -#ifdef CONFIG_OF
>  static const struct of_device_id bmi160_of_match[] = {
>  	{ .compatible = "bosch,bmi160" },
>  	{ },
>  };
>  MODULE_DEVICE_TABLE(of, bmi160_of_match);
> -#endif
>  
>  static struct i2c_driver bmi160_i2c_driver = {
>  	.driver = {
>  		.name			= "bmi160_i2c",
> -		.acpi_match_table	= ACPI_PTR(bmi160_acpi_match),
> -		.of_match_table		= of_match_ptr(bmi160_of_match),
> +		.acpi_match_table	= bmi160_acpi_match,
> +		.of_match_table		= bmi160_of_match,
>  	},
>  	.probe		= bmi160_i2c_probe,
>  	.id_table	= bmi160_i2c_id,
> diff --git a/drivers/iio/imu/bmi160/bmi160_spi.c b/drivers/iio/imu/bmi160/bmi160_spi.c
> index 61389b41c6d9..24f7d75c7903 100644
> --- a/drivers/iio/imu/bmi160/bmi160_spi.c
> +++ b/drivers/iio/imu/bmi160/bmi160_spi.c
> @@ -5,9 +5,8 @@
>   * Copyright (c) 2016, Intel Corporation.
>   *
>   */
> -#include <linux/acpi.h>
> +#include <linux/mod_devicetable.h>
>  #include <linux/module.h>
> -#include <linux/of.h>
>  #include <linux/regmap.h>
>  #include <linux/spi/spi.h>
>  
> @@ -17,6 +16,7 @@ static int bmi160_spi_probe(struct spi_device *spi)
>  {
>  	struct regmap *regmap;
>  	const struct spi_device_id *id = spi_get_device_id(spi);
> +	const char *name;
>  
>  	regmap = devm_regmap_init_spi(spi, &bmi160_regmap_config);
>  	if (IS_ERR(regmap)) {
> @@ -24,7 +24,13 @@ static int bmi160_spi_probe(struct spi_device *spi)
>  			regmap);
>  		return PTR_ERR(regmap);
>  	}
> -	return bmi160_core_probe(&spi->dev, regmap, id->name, true);
> +
> +	if (id)
> +		name = id->name;
> +	else
> +		name = dev_name(&spi->dev);
> +
> +	return bmi160_core_probe(&spi->dev, regmap, name, true);
>  }
>  
>  static const struct spi_device_id bmi160_spi_id[] = {
> @@ -39,20 +45,18 @@ static const struct acpi_device_id bmi160_acpi_match[] = {
>  };
>  MODULE_DEVICE_TABLE(acpi, bmi160_acpi_match);
>  
> -#ifdef CONFIG_OF
>  static const struct of_device_id bmi160_of_match[] = {
>  	{ .compatible = "bosch,bmi160" },
>  	{ },
>  };
>  MODULE_DEVICE_TABLE(of, bmi160_of_match);
> -#endif
>  
>  static struct spi_driver bmi160_spi_driver = {
>  	.probe		= bmi160_spi_probe,
>  	.id_table	= bmi160_spi_id,
>  	.driver = {
> -		.acpi_match_table	= ACPI_PTR(bmi160_acpi_match),
> -		.of_match_table		= of_match_ptr(bmi160_of_match),
> +		.acpi_match_table	= bmi160_acpi_match,
> +		.of_match_table		= bmi160_of_match,
>  		.name			= "bmi160_spi",
>  	},
>  };
diff mbox series

Patch

diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
index 01336105792e..e7aec56ea136 100644
--- a/drivers/iio/imu/bmi160/bmi160_core.c
+++ b/drivers/iio/imu/bmi160/bmi160_core.c
@@ -11,10 +11,9 @@ 
  */
 #include <linux/module.h>
 #include <linux/regmap.h>
-#include <linux/acpi.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
-#include <linux/of_irq.h>
+#include <linux/property.h>
 #include <linux/regulator/consumer.h>
 
 #include <linux/iio/iio.h>
@@ -525,17 +524,6 @@  static const struct iio_info bmi160_info = {
 	.attrs = &bmi160_attrs_group,
 };
 
-static const char *bmi160_match_acpi_device(struct device *dev)
-{
-	const struct acpi_device_id *id;
-
-	id = acpi_match_device(dev->driver->acpi_match_table, dev);
-	if (!id)
-		return NULL;
-
-	return dev_name(dev);
-}
-
 static int bmi160_write_conf_reg(struct regmap *regmap, unsigned int reg,
 				 unsigned int mask, unsigned int bits,
 				 unsigned int write_usleep)
@@ -647,18 +635,18 @@  int bmi160_enable_irq(struct regmap *regmap, bool enable)
 }
 EXPORT_SYMBOL(bmi160_enable_irq);
 
-static int bmi160_get_irq(struct device_node *of_node, enum bmi160_int_pin *pin)
+static int bmi160_get_irq(struct fwnode_handle *fwnode, enum bmi160_int_pin *pin)
 {
 	int irq;
 
 	/* Use INT1 if possible, otherwise fall back to INT2. */
-	irq = of_irq_get_byname(of_node, "INT1");
+	irq = fwnode_irq_get_byname(fwnode, "INT1");
 	if (irq > 0) {
 		*pin = BMI160_PIN_INT1;
 		return irq;
 	}
 
-	irq = of_irq_get_byname(of_node, "INT2");
+	irq = fwnode_irq_get_byname(fwnode, "INT2");
 	if (irq > 0)
 		*pin = BMI160_PIN_INT2;
 
@@ -688,7 +676,7 @@  static int bmi160_config_device_irq(struct iio_dev *indio_dev, int irq_type,
 		return -EINVAL;
 	}
 
-	open_drain = of_property_read_bool(dev->of_node, "drive-open-drain");
+	open_drain = device_property_read_bool(dev, "drive-open-drain");
 
 	return bmi160_config_pin(data->regmap, pin, open_drain, irq_mask,
 				 BMI160_NORMAL_WRITE_USLEEP);
@@ -872,9 +860,6 @@  int bmi160_core_probe(struct device *dev, struct regmap *regmap,
 	if (ret)
 		return ret;
 
-	if (!name && ACPI_HANDLE(dev))
-		name = bmi160_match_acpi_device(dev);
-
 	indio_dev->channels = bmi160_channels;
 	indio_dev->num_channels = ARRAY_SIZE(bmi160_channels);
 	indio_dev->name = name;
@@ -887,7 +872,7 @@  int bmi160_core_probe(struct device *dev, struct regmap *regmap,
 	if (ret)
 		return ret;
 
-	irq = bmi160_get_irq(dev->of_node, &int_pin);
+	irq = bmi160_get_irq(dev_fwnode(dev), &int_pin);
 	if (irq > 0) {
 		ret = bmi160_setup_irq(indio_dev, irq, int_pin);
 		if (ret)
diff --git a/drivers/iio/imu/bmi160/bmi160_i2c.c b/drivers/iio/imu/bmi160/bmi160_i2c.c
index 26398614eddf..02f149d37b17 100644
--- a/drivers/iio/imu/bmi160/bmi160_i2c.c
+++ b/drivers/iio/imu/bmi160/bmi160_i2c.c
@@ -8,10 +8,9 @@ 
  *      - 0x68 if SDO is pulled to GND
  *      - 0x69 if SDO is pulled to VDDIO
  */
-#include <linux/acpi.h>
 #include <linux/i2c.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
-#include <linux/of.h>
 #include <linux/regmap.h>
 
 #include "bmi160.h"
@@ -20,7 +19,7 @@  static int bmi160_i2c_probe(struct i2c_client *client,
 			    const struct i2c_device_id *id)
 {
 	struct regmap *regmap;
-	const char *name = NULL;
+	const char *name;
 
 	regmap = devm_regmap_init_i2c(client, &bmi160_regmap_config);
 	if (IS_ERR(regmap)) {
@@ -31,6 +30,8 @@  static int bmi160_i2c_probe(struct i2c_client *client,
 
 	if (id)
 		name = id->name;
+	else
+		name = dev_name(&client->dev);
 
 	return bmi160_core_probe(&client->dev, regmap, name, false);
 }
@@ -47,19 +48,17 @@  static const struct acpi_device_id bmi160_acpi_match[] = {
 };
 MODULE_DEVICE_TABLE(acpi, bmi160_acpi_match);
 
-#ifdef CONFIG_OF
 static const struct of_device_id bmi160_of_match[] = {
 	{ .compatible = "bosch,bmi160" },
 	{ },
 };
 MODULE_DEVICE_TABLE(of, bmi160_of_match);
-#endif
 
 static struct i2c_driver bmi160_i2c_driver = {
 	.driver = {
 		.name			= "bmi160_i2c",
-		.acpi_match_table	= ACPI_PTR(bmi160_acpi_match),
-		.of_match_table		= of_match_ptr(bmi160_of_match),
+		.acpi_match_table	= bmi160_acpi_match,
+		.of_match_table		= bmi160_of_match,
 	},
 	.probe		= bmi160_i2c_probe,
 	.id_table	= bmi160_i2c_id,
diff --git a/drivers/iio/imu/bmi160/bmi160_spi.c b/drivers/iio/imu/bmi160/bmi160_spi.c
index 61389b41c6d9..24f7d75c7903 100644
--- a/drivers/iio/imu/bmi160/bmi160_spi.c
+++ b/drivers/iio/imu/bmi160/bmi160_spi.c
@@ -5,9 +5,8 @@ 
  * Copyright (c) 2016, Intel Corporation.
  *
  */
-#include <linux/acpi.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
-#include <linux/of.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
 
@@ -17,6 +16,7 @@  static int bmi160_spi_probe(struct spi_device *spi)
 {
 	struct regmap *regmap;
 	const struct spi_device_id *id = spi_get_device_id(spi);
+	const char *name;
 
 	regmap = devm_regmap_init_spi(spi, &bmi160_regmap_config);
 	if (IS_ERR(regmap)) {
@@ -24,7 +24,13 @@  static int bmi160_spi_probe(struct spi_device *spi)
 			regmap);
 		return PTR_ERR(regmap);
 	}
-	return bmi160_core_probe(&spi->dev, regmap, id->name, true);
+
+	if (id)
+		name = id->name;
+	else
+		name = dev_name(&spi->dev);
+
+	return bmi160_core_probe(&spi->dev, regmap, name, true);
 }
 
 static const struct spi_device_id bmi160_spi_id[] = {
@@ -39,20 +45,18 @@  static const struct acpi_device_id bmi160_acpi_match[] = {
 };
 MODULE_DEVICE_TABLE(acpi, bmi160_acpi_match);
 
-#ifdef CONFIG_OF
 static const struct of_device_id bmi160_of_match[] = {
 	{ .compatible = "bosch,bmi160" },
 	{ },
 };
 MODULE_DEVICE_TABLE(of, bmi160_of_match);
-#endif
 
 static struct spi_driver bmi160_spi_driver = {
 	.probe		= bmi160_spi_probe,
 	.id_table	= bmi160_spi_id,
 	.driver = {
-		.acpi_match_table	= ACPI_PTR(bmi160_acpi_match),
-		.of_match_table		= of_match_ptr(bmi160_of_match),
+		.acpi_match_table	= bmi160_acpi_match,
+		.of_match_table		= bmi160_of_match,
 		.name			= "bmi160_spi",
 	},
 };