Revert "SAUCE: pci: prevent sk hynix nvme from entering D3"

BugLink: https://bugs.launchpad.net/bugs/1808957
This reverts commit 623453990672ee8767a51f6e80c8927c42dfc1d5.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Acked-by: Timo Aaltonen <tjaalton@ubuntu.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 1bcd012e00eb37f8f025626a34e03f37010840f8..fb4b0dd22f95f21e9a2a3df7bfa40bb574e5f798 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1188,7 +1188,6 @@ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_AL, PCI_ANY_ID,
    occur when mode detecting */
 DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_VIA, PCI_ANY_ID,
                                PCI_CLASS_STORAGE_IDE, 8, quirk_no_ata_d3);
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SK_HYNIX, 0x1527, quirk_no_ata_d3);
 
 /* This was originally an Alpha specific thing, but it really fits here.
  * The i82375 PCI/EISA bridge appears as non-classified. Fix that.

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 059c1be9f51f1384e0cb0d6c69bab98caff50553..a93350773dfdf9f953e41e6ccd55a662a79b56e2 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -3065,6 +3065,4 @@
 
 #define PCI_VENDOR_ID_OCZ              0x1b85
 
-#define PCI_VENDOR_ID_SK_HYNIX         0x1c5c
-
 #endif /* _LINUX_PCI_IDS_H */