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

[firefly-linux-kernel-4.4.55.git] / drivers / pnp / quirks.c

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 258fef272ea7d6b61faa565260c8fc7b7a4f995d..dfbd5a6cc58becc8cca321e4c6c34a043aebe81f 100644 (file)
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -295,45 +295,6 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
        }
 }
 
-#ifdef CONFIG_AMD_NB
-
-#include <asm/amd_nb.h>
-
-static void quirk_amd_mmconfig_area(struct pnp_dev *dev)
-{
-       resource_size_t start, end;
-       struct pnp_resource *pnp_res;
-       struct resource *res;
-       struct resource mmconfig_res, *mmconfig;
-
-       mmconfig = amd_get_mmconfig_range(&mmconfig_res);
-       if (!mmconfig)
-               return;
-
-       list_for_each_entry(pnp_res, &dev->resources, list) {
-               res = &pnp_res->res;
-               if (res->end < mmconfig->start || res->start > mmconfig->end ||
-                   (res->start == mmconfig->start && res->end == mmconfig->end))
-                       continue;
-
-               dev_info(&dev->dev, FW_BUG
-                        "%pR covers only part of AMD MMCONFIG area %pR; adding more reservations\n",
-                        res, mmconfig);
-               if (mmconfig->start < res->start) {
-                       start = mmconfig->start;
-                       end = res->start - 1;
-                       pnp_add_mem_resource(dev, start, end, 0);
-               }
-               if (mmconfig->end > res->end) {
-                       start = res->end + 1;
-                       end = mmconfig->end;
-                       pnp_add_mem_resource(dev, start, end, 0);
-               }
-               break;
-       }
-}
-#endif
-
 /*
  *  PnP Quirks
  *  Cards or devices that need some tweaking due to incomplete resource info
@@ -361,9 +322,6 @@ static struct pnp_fixup pnp_fixups[] = {
        /* PnP resources that might overlap PCI BARs */
        {"PNP0c01", quirk_system_pci_resources},
        {"PNP0c02", quirk_system_pci_resources},
-#ifdef CONFIG_AMD_NB
-       {"PNP0c01", quirk_amd_mmconfig_area},
-#endif
        {""}
 };