Skip to content

Commit ac61c8a

Browse files
committed
hwmon: (lm70) Revert "hwmon: (lm70) Add support for ACPI"
This reverts commit b58bd4c. 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: b58bd4c ("hwmon: (lm70) Add support for ACPI") Cc: Andrej Picej <andpicej@gmail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent b3ea2fe commit ac61c8a

File tree

1 file changed

+1
-25
lines changed

1 file changed

+1
-25
lines changed

drivers/hwmon/lm70.c

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#include <linux/hwmon.h>
2323
#include <linux/mutex.h>
2424
#include <linux/mod_devicetable.h>
25+
#include <linux/of.h>
2526
#include <linux/property.h>
2627
#include <linux/spi/spi.h>
2728
#include <linux/slab.h>
28-
#include <linux/acpi.h>
2929

3030
#define DRVNAME "lm70"
3131

@@ -148,29 +148,6 @@ static const struct of_device_id lm70_of_ids[] = {
148148
MODULE_DEVICE_TABLE(of, lm70_of_ids);
149149
#endif
150150

151-
#ifdef CONFIG_ACPI
152-
static const struct acpi_device_id lm70_acpi_ids[] = {
153-
{
154-
.id = "LM000070",
155-
.driver_data = LM70_CHIP_LM70,
156-
},
157-
{
158-
.id = "TMP00121",
159-
.driver_data = LM70_CHIP_TMP121,
160-
},
161-
{
162-
.id = "LM000071",
163-
.driver_data = LM70_CHIP_LM71,
164-
},
165-
{
166-
.id = "LM000074",
167-
.driver_data = LM70_CHIP_LM74,
168-
},
169-
{},
170-
};
171-
MODULE_DEVICE_TABLE(acpi, lm70_acpi_ids);
172-
#endif
173-
174151
static int lm70_probe(struct spi_device *spi)
175152
{
176153
struct device *hwmon_dev;
@@ -217,7 +194,6 @@ static struct spi_driver lm70_driver = {
217194
.driver = {
218195
.name = "lm70",
219196
.of_match_table = of_match_ptr(lm70_of_ids),
220-
.acpi_match_table = ACPI_PTR(lm70_acpi_ids),
221197
},
222198
.id_table = lm70_ids,
223199
.probe = lm70_probe,

0 commit comments

Comments
 (0)