iio:adc:ti-adc081c: Drop ACPI ids that seem very unlikely to be official.
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Tue, 21 Jul 2020 17:14:41 +0000 (18:14 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Thu, 3 Sep 2020 18:40:45 +0000 (19:40 +0100)
We have no known users of these in the wild.
it seems very unlikely these are real IDs having the form ADCXXXX
as that ID is owned by Achnor Datacomm not TI.

Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
drivers/iio/adc/ti-adc081c.c

index 9426f70a800598c0f4010708f332e8e5410a6c13..8bc04cfae465db57390d2c5c109c8d70cb3ae1f5 100644 (file)
@@ -19,7 +19,6 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/mod_devicetable.h>
-#include <linux/acpi.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/buffer.h>
@@ -153,17 +152,7 @@ static int adc081c_probe(struct i2c_client *client,
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA))
                return -EOPNOTSUPP;
 
-       if (ACPI_COMPANION(&client->dev)) {
-               const struct acpi_device_id *ad_id;
-
-               ad_id = acpi_match_device(client->dev.driver->acpi_match_table,
-                                         &client->dev);
-               if (!ad_id)
-                       return -ENODEV;
-               model = &adcxx1c_models[ad_id->driver_data];
-       } else {
-               model = &adcxx1c_models[id->driver_data];
-       }
+       model = &adcxx1c_models[id->driver_data];
 
        iio = devm_iio_device_alloc(&client->dev, sizeof(*adc));
        if (!iio)
@@ -238,21 +227,10 @@ static const struct of_device_id adc081c_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, adc081c_of_match);
 
-#ifdef CONFIG_ACPI
-static const struct acpi_device_id adc081c_acpi_match[] = {
-       { "ADC081C", ADC081C },
-       { "ADC101C", ADC101C },
-       { "ADC121C", ADC121C },
-       { }
-};
-MODULE_DEVICE_TABLE(acpi, adc081c_acpi_match);
-#endif
-
 static struct i2c_driver adc081c_driver = {
        .driver = {
                .name = "adc081c",
                .of_match_table = adc081c_of_match,
-               .acpi_match_table = ACPI_PTR(adc081c_acpi_match),
        },
        .probe = adc081c_probe,
        .remove = adc081c_remove,