Skip to contentSkip to conversation

iio: bme680_spi: Remove ACPI support

PATCH In review Guenter Roeck 4 participants 4 messages May 6, 2021 – May 8, 2021 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: bme680_spi: Remove ACPI support

BME0680 is not an official ACPI ID, so let's remove it before someone starts using it.

Cc Andy Shevchenko <[email protected]>
Cc Hans de Goede <[email protected]>
---
 drivers/iio/chemical/bme680_spi.c | 8 --------
 1 file changed, 8 deletions(-)
drivers/iio/chemical/bme680_spi.c +0 -8
index 6f56ad48cc40..cc579a7ac5ce 100644
@@ -4,7 +4,6 @@
  *
  * Copyright (C) 2018 Himanshu Jha <[email protected]>
  */
-#include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/regmap.h>
@@ -145,12 +144,6 @@ static const struct spi_device_id bme680_spi_id[] = {
 };
 MODULE_DEVICE_TABLE(spi, bme680_spi_id);
 
-static const struct acpi_device_id bme680_acpi_match[] = {
-	{"BME0680", 0},
-	{},
-};
-MODULE_DEVICE_TABLE(acpi, bme680_acpi_match);
-
 static const struct of_device_id bme680_of_spi_match[] = {
 	{ .compatible = "bosch,bme680", },
 	{},
@@ -160,7 +153,6 @@ MODULE_DEVICE_TABLE(of, bme680_of_spi_match);
 static struct spi_driver bme680_spi_driver = {
 	.driver = {
 		.name			= "bme680_spi",
-		.acpi_match_table	= ACPI_PTR(bme680_acpi_match),
 		.of_match_table		= bme680_of_spi_match,
 	},
 	.probe = bme680_spi_probe,
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Quoted 6 lines · Guenter Roeck

BME0680 is not an official ACPI ID, so let's remove it before someone starts using it.

Cc Andy Shevchenko <[email protected]>
Cc Hans de Goede <[email protected]>

Thanks, patch looks good to me:

Regards,

Hans

Quoted 38 lines
---
 drivers/iio/chemical/bme680_spi.c | 8 --------
 1 file changed, 8 deletions(-)
drivers/iio/chemical/bme680_spi.c +0 -8
index 6f56ad48cc40..cc579a7ac5ce 100644
@@ -4,7 +4,6 @@
  *
  * Copyright (C) 2018 Himanshu Jha <[email protected]>
  */
-#include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/regmap.h>
@@ -145,12 +144,6 @@ static const struct spi_device_id bme680_spi_id[] = {
 };
 MODULE_DEVICE_TABLE(spi, bme680_spi_id);
 
-static const struct acpi_device_id bme680_acpi_match[] = {
-	{"BME0680", 0},
-	{},
-};
-MODULE_DEVICE_TABLE(acpi, bme680_acpi_match);
-
 static const struct of_device_id bme680_of_spi_match[] = {
 	{ .compatible = "bosch,bme680", },
 	{},
@@ -160,7 +153,6 @@ MODULE_DEVICE_TABLE(of, bme680_of_spi_match);
 static struct spi_driver bme680_spi_driver = {
 	.driver = {
 		.name			= "bme680_spi",
-		.acpi_match_table	= ACPI_PTR(bme680_acpi_match),
 		.of_match_table		= bme680_of_spi_match,
 	},
 	.probe = bme680_spi_probe,
Reviewed-by on v1 1/1
#2 lore raw
In reply to Guenter Roeck
Quoted 3 lines · Guenter Roeck

BME0680 is not an official ACPI ID, so let's remove it before someone starts using it.

Quoted 43 lines
Cc Andy Shevchenko <[email protected]>
Cc Hans de Goede <[email protected]>
---
 drivers/iio/chemical/bme680_spi.c | 8 --------
 1 file changed, 8 deletions(-)
drivers/iio/chemical/bme680_spi.c +0 -9
index 6f56ad48cc40..cc579a7ac5ce 100644
@@ -4,7 +4,6 @@
  *
  * Copyright (C) 2018 Himanshu Jha <[email protected]>
  */
-#include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/regmap.h>
@@ -145,12 +144,6 @@ static const struct spi_device_id bme680_spi_id[] = {
 };
 MODULE_DEVICE_TABLE(spi, bme680_spi_id);
 
-static const struct acpi_device_id bme680_acpi_match[] = {
-       {"BME0680", 0},
-       {},
-};
-MODULE_DEVICE_TABLE(acpi, bme680_acpi_match);
-
 static const struct of_device_id bme680_of_spi_match[] = {
        { .compatible = "bosch,bme680", },
        {},
@@ -160,7 +153,6 @@ MODULE_DEVICE_TABLE(of, bme680_of_spi_match);
 static struct spi_driver bme680_spi_driver = {
        .driver = {
                .name                   = "bme680_spi",
-               .acpi_match_table       = ACPI_PTR(bme680_acpi_match),
                .of_match_table         = bme680_of_spi_match,
        },
        .probe = bme680_spi_probe,
--

2.25.1

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#3 lore raw
In reply to Guenter Roeck
Quoted 6 lines · On Thu, 6 May 2021 06:31:45 -0700 Guenter Roeck <[email protected]> wrote:

BME0680 is not an official ACPI ID, so let's remove it before someone starts using it.

Cc Andy Shevchenko <[email protected]>
Cc Hans de Goede <[email protected]>

Applied with message tweaked for PRP0001 and title changed to make it clear this isn't removing ACPI support, just one means of doing it.

Jonathan

Quoted 37 lines
---
 drivers/iio/chemical/bme680_spi.c | 8 --------
 1 file changed, 8 deletions(-)
drivers/iio/chemical/bme680_spi.c +0 -8
index 6f56ad48cc40..cc579a7ac5ce 100644
@@ -4,7 +4,6 @@
  *
  * Copyright (C) 2018 Himanshu Jha <[email protected]>
  */
-#include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/regmap.h>
@@ -145,12 +144,6 @@ static const struct spi_device_id bme680_spi_id[] = {
 };
 MODULE_DEVICE_TABLE(spi, bme680_spi_id);
 
-static const struct acpi_device_id bme680_acpi_match[] = {
-	{"BME0680", 0},
-	{},
-};
-MODULE_DEVICE_TABLE(acpi, bme680_acpi_match);
-
 static const struct of_device_id bme680_of_spi_match[] = {
 	{ .compatible = "bosch,bme680", },
 	{},
@@ -160,7 +153,6 @@ MODULE_DEVICE_TABLE(of, bme680_of_spi_match);
 static struct spi_driver bme680_spi_driver = {
 	.driver = {
 		.name			= "bme680_spi",
-		.acpi_match_table	= ACPI_PTR(bme680_acpi_match),
 		.of_match_table		= bme680_of_spi_match,
 	},
 	.probe = bme680_spi_probe,