From 74611a3e4e28c65a563e6e14319d7247e47df9e5 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Sun, 17 Mar 2024 08:47:50 +0000 Subject: [PATCH 6/6] Bring back deprecated pci ids to qla2xxx driver --- drivers/scsi/qla2xxx/qla_os.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index b7150d64d..76711803a 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -2869,7 +2869,7 @@ static void qla2x00_iocb_work_fn(struct work_struct *work) spin_unlock_irqrestore(&vha->work_lock, flags); } -#ifdef CONFIG_RHEL_DIFFERENCES +#ifdef CONFIG_ALMALINUX_DIFFERENCES static const struct pci_device_id rh_deprecated_pci_table[] = { { 0 } }; @@ -2926,7 +2926,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) struct rsp_que *rsp = NULL; int i; -#ifdef CONFIG_RHEL_DIFFERENCES +#ifdef CONFIG_ALMALINUX_DIFFERENCES if (pci_hw_disabled(rh_disabled_pci_table, pdev)) return -ENODEV; @@ -8110,7 +8110,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { }; static struct pci_device_id qla2xxx_pci_tbl[] = { -#ifndef CONFIG_RHEL_DIFFERENCES +#ifndef CONFIG_ALMALINUX_DIFFERENCES { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, @@ -8126,12 +8126,12 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { #endif { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) }, -#ifndef CONFIG_RHEL_DIFFERENCES +#ifndef CONFIG_ALMALINUX_DIFFERENCES { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8001) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8021) }, #endif { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8031) }, -#ifndef CONFIG_RHEL_DIFFERENCES +#ifndef CONFIG_ALMALINUX_DIFFERENCES { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISPF001) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) }, #endif -- 2.39.3