Skip to contentSkip to conversation

iio: pressure: bmp280: Drop ACPI support

PATCH Applied Andy Shevchenko 2 participants 4 messages Dec 9, 2019 – Dec 23, 2019 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 iio: pressure: bmp280: Drop ACPI support

There is no evidence of officially registered ACPI IDs for these devices. Thus, revert ACPI support from the driver. All authors of the respective changes are being informed here:

d5c94568cc1d ("iio: add bmp280 pressure and temperature driver") 6dba72eca7fb ("iio: pressure: bmp280: add support for BMP180") 14beaa8f5ab1 ("iio: pressure: bmp280: add humidity support")

Above seems a cargo cult without paying attention to how ACPI IDs are being allocated.

Cc Vlad Dogaru <[email protected]>
Cc Akinobu Mita <[email protected]>
Cc Matt Ranostay <[email protected]>
---
 drivers/iio/pressure/bmp280-i2c.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/iio/pressure/bmp280-i2c.c +0 -11
index 3109c8e2cc11..06f90853c141 100644
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/acpi.h>
 #include <linux/of.h>
 #include <linux/regmap.h>
 
@@ -38,15 +37,6 @@ static int bmp280_i2c_probe(struct i2c_client *client,
 				   client->irq);
 }
 
-static const struct acpi_device_id bmp280_acpi_i2c_match[] = {
-	{"BMP0280", BMP280_CHIP_ID },
-	{"BMP0180", BMP180_CHIP_ID },
-	{"BMP0085", BMP180_CHIP_ID },
-	{"BME0280", BME280_CHIP_ID },
-	{ },
-};
-MODULE_DEVICE_TABLE(acpi, bmp280_acpi_i2c_match);
-
 #ifdef CONFIG_OF
 static const struct of_device_id bmp280_of_i2c_match[] = {
 	{ .compatible = "bosch,bme280", .data = (void *)BME280_CHIP_ID },
@@ -72,7 +62,6 @@ MODULE_DEVICE_TABLE(i2c, bmp280_i2c_id);
 static struct i2c_driver bmp280_i2c_driver = {
 	.driver = {
 		.name	= "bmp280",
-		.acpi_match_table = ACPI_PTR(bmp280_acpi_i2c_match),
 		.of_match_table = of_match_ptr(bmp280_of_i2c_match),
 		.pm = &bmp280_dev_pm_ops,
 	},
Signature · 1 line
2.24.0
#1 lore raw

PATCH 2/2 iio: pressure: bmp280: Allow device to be enumerated from ACPI

There is no need to limit the driver use by OF/platform code. In this case we simple remove redundant OF parts from the code.

---
 drivers/iio/pressure/bmp280-i2c.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/iio/pressure/bmp280-i2c.c +1 -6
index 06f90853c141..8b03ea15c0d0 100644
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/of.h>
 #include <linux/regmap.h>
 
 #include "bmp280.h"
@@ -37,7 +36,6 @@ static int bmp280_i2c_probe(struct i2c_client *client,
 				   client->irq);
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id bmp280_of_i2c_match[] = {
 	{ .compatible = "bosch,bme280", .data = (void *)BME280_CHIP_ID },
 	{ .compatible = "bosch,bmp280", .data = (void *)BMP280_CHIP_ID },
@@ -46,9 +44,6 @@ static const struct of_device_id bmp280_of_i2c_match[] = {
 	{ },
 };
 MODULE_DEVICE_TABLE(of, bmp280_of_i2c_match);
-#else
-#define bmp280_of_i2c_match NULL
-#endif
 
 static const struct i2c_device_id bmp280_i2c_id[] = {
 	{"bmp280", BMP280_CHIP_ID },
@@ -62,7 +57,7 @@ MODULE_DEVICE_TABLE(i2c, bmp280_i2c_id);
 static struct i2c_driver bmp280_i2c_driver = {
 	.driver = {
 		.name	= "bmp280",
-		.of_match_table = of_match_ptr(bmp280_of_i2c_match),
+		.of_match_table = bmp280_of_i2c_match,
 		.pm = &bmp280_dev_pm_ops,
 	},
 	.probe		= bmp280_i2c_probe,
Signature · 1 line
2.24.0
maintainer Applied
#2 lore raw

Re: [PATCH v1 2/2] iio: pressure: bmp280: Allow device to be enumerated from ACPI

Quoted 4 lines · On Mon, 9 Dec 2019 20:28:05 +0200 Andy Shevchenko…

There is no need to limit the driver use by OF/platform code. In this case we simple remove redundant OF parts from the code.

Applied,

Thanks,

Jonathan

Quoted 43 lines
---
 drivers/iio/pressure/bmp280-i2c.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/iio/pressure/bmp280-i2c.c +1 -6
index 06f90853c141..8b03ea15c0d0 100644
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/of.h>
 #include <linux/regmap.h>
 
 #include "bmp280.h"
@@ -37,7 +36,6 @@ static int bmp280_i2c_probe(struct i2c_client *client,
 				   client->irq);
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id bmp280_of_i2c_match[] = {
 	{ .compatible = "bosch,bme280", .data = (void *)BME280_CHIP_ID },
 	{ .compatible = "bosch,bmp280", .data = (void *)BMP280_CHIP_ID },
@@ -46,9 +44,6 @@ static const struct of_device_id bmp280_of_i2c_match[] = {
 	{ },
 };
 MODULE_DEVICE_TABLE(of, bmp280_of_i2c_match);
-#else
-#define bmp280_of_i2c_match NULL
-#endif
 
 static const struct i2c_device_id bmp280_i2c_id[] = {
 	{"bmp280", BMP280_CHIP_ID },
@@ -62,7 +57,7 @@ MODULE_DEVICE_TABLE(i2c, bmp280_i2c_id);
 static struct i2c_driver bmp280_i2c_driver = {
 	.driver = {
 		.name	= "bmp280",
-		.of_match_table = of_match_ptr(bmp280_of_i2c_match),
+		.of_match_table = bmp280_of_i2c_match,
 		.pm = &bmp280_dev_pm_ops,
 	},
 	.probe		= bmp280_i2c_probe,
maintainer
#3 lore raw
In reply to Andy Shevchenko
Quoted 8 lines · On Mon, 9 Dec 2019 20:28:04 +0200 Andy Shevchenko…

There is no evidence of officially registered ACPI IDs for these devices. Thus, revert ACPI support from the driver. All authors of the respective changes are being informed here:

d5c94568cc1d ("iio: add bmp280 pressure and temperature driver") 6dba72eca7fb ("iio: pressure: bmp280: add support for BMP180") 14beaa8f5ab1 ("iio: pressure: bmp280: add humidity support")

Quoted 7 lines

Above seems a cargo cult without paying attention to how ACPI IDs are being allocated.

Cc Vlad Dogaru <[email protected]>
Cc Akinobu Mita <[email protected]>
Cc Matt Ranostay <[email protected]>

Good indeed to clean some of these out. I'm personally a lot more familiar with the delights of ACPI than I was back then (and know the person with the hisilicon list all too well ;)

Anyhow, applied to the togreg branch of iio.git and pushed out as testing though I can't imagine how this would break.

Thanks,

Jonathan

Quoted 40 lines
---
 drivers/iio/pressure/bmp280-i2c.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/iio/pressure/bmp280-i2c.c +0 -11
index 3109c8e2cc11..06f90853c141 100644
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/acpi.h>
 #include <linux/of.h>
 #include <linux/regmap.h>
 
@@ -38,15 +37,6 @@ static int bmp280_i2c_probe(struct i2c_client *client,
 				   client->irq);
 }
 
-static const struct acpi_device_id bmp280_acpi_i2c_match[] = {
-	{"BMP0280", BMP280_CHIP_ID },
-	{"BMP0180", BMP180_CHIP_ID },
-	{"BMP0085", BMP180_CHIP_ID },
-	{"BME0280", BME280_CHIP_ID },
-	{ },
-};
-MODULE_DEVICE_TABLE(acpi, bmp280_acpi_i2c_match);
-
 #ifdef CONFIG_OF
 static const struct of_device_id bmp280_of_i2c_match[] = {
 	{ .compatible = "bosch,bme280", .data = (void *)BME280_CHIP_ID },
@@ -72,7 +62,6 @@ MODULE_DEVICE_TABLE(i2c, bmp280_i2c_id);
 static struct i2c_driver bmp280_i2c_driver = {
 	.driver = {
 		.name	= "bmp280",
-		.acpi_match_table = ACPI_PTR(bmp280_acpi_i2c_match),
 		.of_match_table = of_match_ptr(bmp280_of_i2c_match),
 		.pm = &bmp280_dev_pm_ops,
 	},