Commit 28da9dee authored by Guenter Roeck's avatar Guenter Roeck

Revert "hwmon: (sch56xx-common) Add DMI override table"

This reverts commit fd2d53c3.

As reported by Ian Nartowicz, this and the preceding patch
result in a failure to load the driver on Celsius W280.
While the alternative would be to add the board to the DMI
override table, it is quite likely that other systems are
also affected. Revert the offending patches to avoid future
problems.

Fixes: fd2d53c3 ("hwmon: (sch56xx-common) Add DMI override table")
Reported-by: default avatarIan Nartowicz <deadbeef@nartowicz.co.uk>
Closes: https://lore.kernel.org/linux-hwmon/20231025192239.3c5389ae@debian.org/T/#t
Cc: Armin Wolf <W_Armin@gmx.de>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 920057ad
...@@ -523,28 +523,6 @@ static int __init sch56xx_device_add(int address, const char *name) ...@@ -523,28 +523,6 @@ static int __init sch56xx_device_add(int address, const char *name)
return PTR_ERR_OR_ZERO(sch56xx_pdev); return PTR_ERR_OR_ZERO(sch56xx_pdev);
} }
static const struct dmi_system_id sch56xx_dmi_override_table[] __initconst = {
{
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS W380"),
},
},
{
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO P710"),
},
},
{
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO E9900"),
},
},
{ }
};
/* For autoloading only */ /* For autoloading only */
static const struct dmi_system_id sch56xx_dmi_table[] __initconst = { static const struct dmi_system_id sch56xx_dmi_table[] __initconst = {
{ {
...@@ -565,18 +543,16 @@ static int __init sch56xx_init(void) ...@@ -565,18 +543,16 @@ static int __init sch56xx_init(void)
if (!dmi_check_system(sch56xx_dmi_table)) if (!dmi_check_system(sch56xx_dmi_table))
return -ENODEV; return -ENODEV;
if (!dmi_check_system(sch56xx_dmi_override_table)) { /*
/* * Some machines like the Esprimo P720 and Esprimo C700 have
* Some machines like the Esprimo P720 and Esprimo C700 have * onboard devices named " Antiope"/" Theseus" instead of
* onboard devices named " Antiope"/" Theseus" instead of * "Antiope"/"Theseus", so we need to check for both.
* "Antiope"/"Theseus", so we need to check for both. */
*/ if (!dmi_find_device(DMI_DEV_TYPE_OTHER, "Antiope", NULL) &&
if (!dmi_find_device(DMI_DEV_TYPE_OTHER, "Antiope", NULL) && !dmi_find_device(DMI_DEV_TYPE_OTHER, " Antiope", NULL) &&
!dmi_find_device(DMI_DEV_TYPE_OTHER, " Antiope", NULL) && !dmi_find_device(DMI_DEV_TYPE_OTHER, "Theseus", NULL) &&
!dmi_find_device(DMI_DEV_TYPE_OTHER, "Theseus", NULL) && !dmi_find_device(DMI_DEV_TYPE_OTHER, " Theseus", NULL))
!dmi_find_device(DMI_DEV_TYPE_OTHER, " Theseus", NULL)) return -ENODEV;
return -ENODEV;
}
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment