On Mon, 9 Dec 2019 20:28:04 +0200
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
> 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 <ddvlad@xxxxxxxxx>
> Cc: Akinobu Mita <akinobu.mita@xxxxxxxxx>
> Cc: Matt Ranostay <mranostay@xxxxxxxxx>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
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
> ---
> drivers/iio/pressure/bmp280-i2c.c | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/drivers/iio/pressure/bmp280-i2c.c b/drivers/iio/pressure/bmp280-i2c.c
> index 3109c8e2cc11..06f90853c141 100644
> --- a/drivers/iio/pressure/bmp280-i2c.c
> +++ b/drivers/iio/pressure/bmp280-i2c.c
> @@ -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,
> },
