diff options
author | Tom Rix <trix@redhat.com> | 2022-03-22 17:46:48 +0300 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-03-30 07:00:59 +0300 |
commit | 37a9bd7090cdf6657ced3f693897819a66ee8d52 (patch) | |
tree | 0390e6b8495b02c1009501ed96901e89390a3ebe /drivers/scsi/aic7xxx/aic79xx_pci.c | |
parent | 5ca0faf9c292029ec6f9edbfe7b42e97dcb87dca (diff) | |
download | linux-37a9bd7090cdf6657ced3f693897819a66ee8d52.tar.xz |
scsi: aic7xxx: Use standard PCI subsystem, subdevice defines
Common defines should be used over custom defines.
Change and remove these defines:
- PCIR_SUBVEND_0 to PCI_SUBSYSTEM_VENDOR_ID
- PCIR_SUBDEV_0 to PCI_SUBSYSTEM_ID
Link: https://lore.kernel.org/r/20220322144648.2467777-1-trix@redhat.com
Signed-off-by: Tom Rix <trix@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx_pci.c')
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c index 2f0bdb9225a4..5fad41b1ab58 100644 --- a/drivers/scsi/aic7xxx/aic79xx_pci.c +++ b/drivers/scsi/aic7xxx/aic79xx_pci.c @@ -260,8 +260,8 @@ ahd_find_pci_device(ahd_dev_softc_t pci) vendor = ahd_pci_read_config(pci, PCIR_DEVVENDOR, /*bytes*/2); device = ahd_pci_read_config(pci, PCIR_DEVICE, /*bytes*/2); - subvendor = ahd_pci_read_config(pci, PCIR_SUBVEND_0, /*bytes*/2); - subdevice = ahd_pci_read_config(pci, PCIR_SUBDEV_0, /*bytes*/2); + subvendor = ahd_pci_read_config(pci, PCI_SUBSYSTEM_VENDOR_ID, /*bytes*/2); + subdevice = ahd_pci_read_config(pci, PCI_SUBSYSTEM_ID, /*bytes*/2); full_id = ahd_compose_id(device, vendor, subdevice, @@ -298,7 +298,7 @@ ahd_pci_config(struct ahd_softc *ahd, const struct ahd_pci_identity *entry) * Record if this is an HP board. */ subvendor = ahd_pci_read_config(ahd->dev_softc, - PCIR_SUBVEND_0, /*bytes*/2); + PCI_SUBSYSTEM_VENDOR_ID, /*bytes*/2); if (subvendor == SUBID_HP) ahd->flags |= AHD_HP_BOARD; |