hwmon: (lm70) Revert "hwmon: (lm70) Add support for ACPI"
authorGuenter Roeck <linux@roeck-us.net>
Sat, 8 May 2021 16:44:50 +0000 (09:44 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Thu, 17 Jun 2021 11:21:44 +0000 (04:21 -0700)
This reverts commit b58bd4c6dfe709646ed9efcbba2a70643f9bc873.

None of the ACPI IDs introduced with the reverted patch is a valid ACPI
device ID. Any ACPI users of this driver are advised to use PRP0001 and
a devicetree-compatible device identification.

Fixes: b58bd4c6dfe7 ("hwmon: (lm70) Add support for ACPI")
Cc: Andrej Picej <andpicej@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/lm70.c

index 40eab33..6b884ea 100644 (file)
 #include <linux/hwmon.h>
 #include <linux/mutex.h>
 #include <linux/mod_devicetable.h>
+#include <linux/of.h>
 #include <linux/property.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
-#include <linux/acpi.h>
 
 #define DRVNAME                "lm70"
 
@@ -148,29 +148,6 @@ static const struct of_device_id lm70_of_ids[] = {
 MODULE_DEVICE_TABLE(of, lm70_of_ids);
 #endif
 
-#ifdef CONFIG_ACPI
-static const struct acpi_device_id lm70_acpi_ids[] = {
-       {
-               .id = "LM000070",
-               .driver_data = LM70_CHIP_LM70,
-       },
-       {
-               .id = "TMP00121",
-               .driver_data = LM70_CHIP_TMP121,
-       },
-       {
-               .id = "LM000071",
-               .driver_data = LM70_CHIP_LM71,
-       },
-       {
-               .id = "LM000074",
-               .driver_data = LM70_CHIP_LM74,
-       },
-       {},
-};
-MODULE_DEVICE_TABLE(acpi, lm70_acpi_ids);
-#endif
-
 static int lm70_probe(struct spi_device *spi)
 {
        struct device *hwmon_dev;
@@ -217,7 +194,6 @@ static struct spi_driver lm70_driver = {
        .driver = {
                .name   = "lm70",
                .of_match_table = of_match_ptr(lm70_of_ids),
-               .acpi_match_table = ACPI_PTR(lm70_acpi_ids),
        },
        .id_table = lm70_ids,
        .probe  = lm70_probe,