You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
87 lines
3.0 KiB
87 lines
3.0 KiB
1 month ago
|
From 0e54f93854865b95b50e8023645e423af634e4ec Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||
|
|
Date: Tue, 9 Apr 2024 17:27:35 +0000
|
||
|
|
Subject: [PATCH 1/3] Bring back deprecated pci ids to lpfc driver
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/scsi/lpfc/lpfc_ids.h | 12 ------------
|
||
|
|
1 file changed, 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h
|
||
|
|
index 85fc52038..0b1616e93 100644
|
||
|
|
--- a/drivers/scsi/lpfc/lpfc_ids.h
|
||
|
|
+++ b/drivers/scsi/lpfc/lpfc_ids.h
|
||
|
|
@@ -24,7 +24,6 @@
|
||
|
|
#include <linux/pci.h>
|
||
|
|
|
||
|
|
const struct pci_device_id lpfc_id_table[] = {
|
||
|
|
-#ifndef CONFIG_RHEL_DIFFERENCES
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY,
|
||
|
|
@@ -55,13 +54,10 @@ const struct pci_device_id lpfc_id_table[] = {
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
-#endif
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
-#ifndef CONFIG_RHEL_DIFFERENCES
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
-#endif
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
|
||
|
|
@@ -72,7 +68,6 @@ const struct pci_device_id lpfc_id_table[] = {
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
-#ifndef CONFIG_RHEL_DIFFERENCES
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101,
|
||
|
|
@@ -83,7 +78,6 @@ const struct pci_device_id lpfc_id_table[] = {
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
-#endif
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID,
|
||
|
|
@@ -96,7 +90,6 @@ const struct pci_device_id lpfc_id_table[] = {
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
-#ifndef CONFIG_RHEL_DIFFERENCES
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,
|
||
|
|
@@ -107,23 +100,18 @@ const struct pci_device_id lpfc_id_table[] = {
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
-#endif
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
-#ifndef CONFIG_RHEL_DIFFERENCES
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
-#endif
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
-#ifndef CONFIG_RHEL_DIFFERENCES
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC_VF,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE_VF,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
-#endif
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G6_FC,
|
||
|
|
PCI_ANY_ID, PCI_ANY_ID, },
|
||
|
|
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|