From 5d2b51687b83cc1d07684903103f49f6067da85f Mon Sep 17 00:00:00 2001 From: Kai-Heng Feng Date: Mon, 10 Jun 2019 12:51:34 +0800 Subject: [PATCH 1/1] 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 Acked-by: Timo Aaltonen Acked-by: Stefan Bader Signed-off-by: Kleber Sacilotto de Souza --- drivers/pci/quirks.c | 1 - include/linux/pci_ids.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 1bcd012e00eb..fb4b0dd22f95 100644 --- 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 059c1be9f51f..a93350773dfd 100644 --- 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 */ -- 2.39.2