Merge branch 'linux-5.7' of git://github.com/skeggsb/linux into drm-fixes

[linux-2.6-microblaze.git] / drivers / iio / pressure / bmp280-i2c.c

diff --git a/drivers/iio/pressure/bmp280-i2c.c b/drivers/iio/pressure/bmp280-i2c.c
index 3109c8e..8b03ea1 100644 (file)
--- a/drivers/iio/pressure/bmp280-i2c.c
+++ b/drivers/iio/pressure/bmp280-i2c.c
@@ -1,8 +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>
 
 #include "bmp280.h"
@@ -38,16 +36,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 },
        { .compatible = "bosch,bmp280", .data = (void *)BMP280_CHIP_ID },
@@ -56,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 },
@@ -72,8 +57,7 @@ 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),
+               .of_match_table = bmp280_of_i2c_match,
                .pm = &bmp280_dev_pm_ops,
        },
        .probe          = bmp280_i2c_probe,