aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVernon Mauery <vernux@us.ibm.com>2010-11-02 13:08:10 -0700
committerMatthew Garrett <mjg@redhat.com>2010-11-24 11:59:57 -0500
commita2262260f9eaee4acd56b5624b5d2bf4be9bb38a (patch)
tree2af951bd5e6fecdefd4687e0ed4d2dd3397b2156
parentd41014b92d60a6b375aad9b6ebc52201ee58df70 (diff)
downloadmrst-s0i3-test-a2262260f9eaee4acd56b5624b5d2bf4be9bb38a.tar.gz
mrst-s0i3-test-a2262260f9eaee4acd56b5624b5d2bf4be9bb38a.tar.xz
mrst-s0i3-test-a2262260f9eaee4acd56b5624b5d2bf4be9bb38a.zip
ibm_rtl: Loosen the DMI criteria to all IBM machines
Allow all IBM machines to pass the DMI check so that we don't have to add them one by one to the driver. Any IBM machine that has the _RTL_ table in the EBDA will work. Signed-off-by: Vernon Mauery <vernux@us.ibm.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
-rw-r--r--drivers/platform/x86/ibm_rtl.c29
1 files changed, 5 insertions, 24 deletions
diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
index a884f549884..5c975edb3c8 100644
--- a/drivers/platform/x86/ibm_rtl.c
+++ b/drivers/platform/x86/ibm_rtl.c
@@ -220,32 +220,13 @@ static void rtl_teardown_sysfs(void) {
sysdev_class_unregister(&class_rtl);
}
-static int dmi_check_cb(const struct dmi_system_id *id)
-{
- RTL_DEBUG("found IBM server '%s'\n", id->ident);
- return 0;
-}
-
-#define ibm_dmi_entry(NAME, TYPE) \
-{ \
- .ident = NAME, \
- .matches = { \
- DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
- DMI_MATCH(DMI_PRODUCT_NAME, TYPE), \
- }, \
- .callback = dmi_check_cb \
-}
static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
- ibm_dmi_entry("BladeCenter LS21", "7971"),
- ibm_dmi_entry("BladeCenter LS22", "7901"),
- ibm_dmi_entry("BladeCenter HS21 XM", "7995"),
- ibm_dmi_entry("BladeCenter HS22", "7870"),
- ibm_dmi_entry("BladeCenter HS22V", "7871"),
- ibm_dmi_entry("System x3550 M2", "7946"),
- ibm_dmi_entry("System x3650 M2", "7947"),
- ibm_dmi_entry("System x3550 M3", "7944"),
- ibm_dmi_entry("System x3650 M3", "7945"),
+ { \
+ .matches = { \
+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
+ }, \
+ },
{ }
};