--- a/src/lpfc_ids.h +++ b/src/lpfc_ids.h @@ -27 +26,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES @@ -58 +56,0 @@ -#endif @@ -61 +58,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES @@ -64 +60,0 @@ -#endif @@ -67 +62,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES @@ -70 +64,0 @@ -#endif @@ -79 +72,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES @@ -90 +82,0 @@ -#endif @@ -103 +94,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES @@ -114 +104,0 @@ -#endif @@ -117 +106,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES @@ -120 +108,0 @@ -#endif @@ -123 +110,0 @@ -#ifndef CONFIG_RHEL_DIFFERENCES @@ -130 +116,0 @@ -#endif @@ -144,4 +129,0 @@ -#ifdef CONFIG_RHEL_DIFFERENCES -static const struct pci_device_id rh_deprecated_pci_table[] = { - { 0 } -}; @@ -149,20 +130,0 @@ -static const struct pci_device_id rh_unmaintained_pci_table[] = { - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SKYHAWK, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_SMB, - PCI_ANY_ID, PCI_ANY_ID, }, - {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S, - PCI_ANY_ID, PCI_ANY_ID, }, - { 0 } -}; - -static const struct pci_device_id rh_disabled_pci_table[] = { - { 0 } -}; -#endif --- a/src/lpfc_init.c +++ b/src/lpfc_init.c @@ -15276,7 +15275,0 @@ -#ifdef CONFIG_RHEL_DIFFERENCES - if (pci_hw_disabled(rh_disabled_pci_table, pdev)) - return -ENODEV; - - pci_hw_deprecated(rh_deprecated_pci_table, pdev); - pci_hw_unmaintained(rh_unmaintained_pci_table, pdev); -#endif