From bb598349f75bde28cc102ac213fcfc5649738bb6 Mon Sep 17 00:00:00 2001 From: Peter Georg Date: Mar 23 2022 20:30:14 +0000 Subject: Update patch --- diff --git a/SOURCES/0001-add-deprecated-ids.patch b/SOURCES/0001-add-deprecated-ids.patch index cbcba5f..785b235 100644 --- a/SOURCES/0001-add-deprecated-ids.patch +++ b/SOURCES/0001-add-deprecated-ids.patch @@ -1,9 +1,7 @@ --- a/src/megaraid_sas_base.c +++ b/src/megaraid_sas_base.c -@@ -138,12 +138,24 @@ - */ - static struct pci_device_id megasas_pci_table[] = { - +@@ -142 +142,8 @@ +- + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)}, + /* xscale IOP */ + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)}, @@ -12,27 +10,13 @@ + /* ppc IOP */ + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078GEN2)}, + /* gen2*/ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0079GEN2)}, - /* gen2*/ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0073SKINNY)}, - /* skinny*/ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0071SKINNY)}, - /* skinny*/ +@@ -148,0 +156,4 @@ + {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_VERDE_ZCR)}, + /* xscale IOP, vega */ + {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)}, + /* xscale IOP */ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FUSION)}, - /* Fusion */ - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)}, -@@ -178,20 +190,6 @@ - - MODULE_DEVICE_TABLE(pci, megasas_pci_table); - --/* -- * PCI ID table for all unsupported controllers -- */ --static struct pci_device_id unsupported_ids_table[] = { +@@ -183,18 +193,0 @@ +-static struct pci_device_id rh_unmaintained_pci_table[] = { - - {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS0079GEN2)}, - /* gen2*/ @@ -43,15 +27,14 @@ - {} -}; - - static int megasas_mgmt_majorno; - struct megasas_mgmt_info megasas_mgmt_info; - static struct fasync_struct *megasas_async_queue; -@@ -7345,8 +7343,6 @@ - struct megasas_instance *instance; - u16 control = 0; - -- check_unsupported_pci_hardware(unsupported_ids_table, pdev); +-static struct pci_device_id rh_deprecated_pci_table[] = { +- +- {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FUSION)}, +- /* Fusion */ +- {} +-}; +- +@@ -7406,3 +7398,0 @@ - - switch (pdev->device) { - case PCI_DEVICE_ID_LSI_AERO_10E0: - case PCI_DEVICE_ID_LSI_AERO_10E3: +- pci_hw_deprecated(rh_deprecated_pci_table, pdev); +- pci_hw_unmaintained(rh_unmaintained_pci_table, pdev);