forked from rpms/kernel
58 lines
1.9 KiB
Diff
58 lines
1.9 KiB
Diff
|
From 6de734334d2f24565419104a4deb8678739ab0bc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||
|
|
Date: Sat, 16 Mar 2024 17:11:39 +0000
|
||
|
|
Subject: [PATCH 3/6] Bring back deprecated pci ids to mptsas-mptspi driver
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/message/fusion/mptsas.c | 4 ++--
|
||
|
|
drivers/message/fusion/mptspi.c | 4 ++--
|
||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
|
||
|
|
index e52f5cdaf..3177c2dee 100644
|
||
|
|
--- a/drivers/message/fusion/mptsas.c
|
||
|
|
+++ b/drivers/message/fusion/mptsas.c
|
||
|
|
@@ -5163,7 +5163,7 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||
|
|
int error=0;
|
||
|
|
int r;
|
||
|
|
|
||
|
|
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||
|
|
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
|
||
|
|
mark_driver_unmaintained(MYNAM);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
@@ -5385,7 +5385,7 @@ static void mptsas_remove(struct pci_dev *pdev)
|
||
|
|
}
|
||
|
|
|
||
|
|
static struct pci_device_id mptsas_pci_table[] = {
|
||
|
|
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||
|
|
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
|
||
|
|
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
|
||
|
|
PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
|
||
|
|
#else
|
||
|
|
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
|
||
|
|
index 1c226920c..beb7a4b35 100644
|
||
|
|
--- a/drivers/message/fusion/mptspi.c
|
||
|
|
+++ b/drivers/message/fusion/mptspi.c
|
||
|
|
@@ -1238,7 +1238,7 @@ static struct spi_function_template mptspi_transport_functions = {
|
||
|
|
*/
|
||
|
|
|
||
|
|
static struct pci_device_id mptspi_pci_table[] = {
|
||
|
|
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||
|
|
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
|
||
|
|
{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
|
||
|
|
PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
|
||
|
|
#else
|
||
|
|
@@ -1540,7 +1540,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||
|
|
|
||
|
|
scsi_scan_host(sh);
|
||
|
|
|
||
|
|
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||
|
|
+#ifdef CONFIG_ALMALINUX_DIFFERENCES
|
||
|
|
add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
|
||
|
|
pr_warn("MPTSPI MODULE IS NOT SUPPORTED\n");
|
||
|
|
#endif
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|