rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / drivers / platform / x86 / intel_ips.c

diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index e66bbba9929ddd517e1363181ac51676e8d4e80c..5ffe7c3981482f7076ea95172cd0e960a04e465f 100644 (file)
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -72,7 +72,6 @@
 #include <linux/string.h>
 #include <linux/tick.h>
 #include <linux/timer.h>
-#include <linux/dmi.h>
 #include <drm/i915_drm.h>
 #include <asm/msr.h>
 #include <asm/processor.h>
@@ -1506,24 +1505,6 @@ static DEFINE_PCI_DEVICE_TABLE(ips_id_table) = {
 
 MODULE_DEVICE_TABLE(pci, ips_id_table);
 
-static int ips_blacklist_callback(const struct dmi_system_id *id)
-{
-       pr_info("Blacklisted intel_ips for %s\n", id->ident);
-       return 1;
-}
-
-static const struct dmi_system_id ips_blacklist[] = {
-       {
-               .callback = ips_blacklist_callback,
-               .ident = "HP ProBook",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "HP ProBook"),
-               },
-       },
-       { }     /* terminating entry */
-};
-
 static int ips_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
        u64 platform_info;
@@ -1533,9 +1514,6 @@ static int ips_probe(struct pci_dev *dev, const struct pci_device_id *id)
        u16 htshi, trc, trc_required_mask;
        u8 tse;
 
-       if (dmi_check_system(ips_blacklist))
-               return -ENODEV;
-
        ips = kzalloc(sizeof(struct ips_driver), GFP_KERNEL);
        if (!ips)
                return -ENOMEM;