lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 321/800] hwmon: (lm70) Revert "hwmon: (lm70) Add support for ACPI"
    Date
    From: Guenter Roeck <linux@roeck-us.net>

    [ Upstream commit ac61c8aae446b9c0fe18981fe721d4a43e283ad6 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hwmon/lm70.c | 26 +-------------------------
    1 file changed, 1 insertion(+), 25 deletions(-)

    diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c
    index 40eab3349904..6b884ea00987 100644
    --- a/drivers/hwmon/lm70.c
    +++ b/drivers/hwmon/lm70.c
    @@ -22,10 +22,10 @@
    #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,
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:30    [W:4.150 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site