From 7df52ee68f57ea9890dd7a517ab003b97e9cf178 Mon Sep 17 00:00:00 2001 From: "James.Smart@Emulex.Com" Date: Mon, 28 Nov 2005 15:08:56 -0500 Subject: [PATCH] --- yaml --- r: 15637 b: refs/heads/master c: fefcb2b677fbfce894133e59a34395f8988d4610 h: refs/heads/master i: 15635: a15ffc3acf721f4d43c4346802b6b4f3800adf51 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_init.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index f08226ab486d..518562fb235a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 445cf4f4d2aa28f6ddd1d7a5f0986341ad61ec91 +refs/heads/master: fefcb2b677fbfce894133e59a34395f8988d4610 diff --git a/trunk/drivers/scsi/lpfc/lpfc_init.c b/trunk/drivers/scsi/lpfc/lpfc_init.c index db3c2ad4e941..b7a603a45328 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_init.c +++ b/trunk/drivers/scsi/lpfc/lpfc_init.c @@ -763,14 +763,12 @@ static void lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp) { lpfc_vpd_t *vp; - uint16_t dev_id; - uint16_t dev_subid; - uint8_t hdrtype; + uint16_t dev_id = phba->pcidev->device; + uint16_t dev_subid = phba->pcidev->subsystem_device; + uint8_t hdrtype = phba->pcidev->hdr_type; char *model_str = ""; vp = &phba->vpd; - pci_read_config_word(phba->pcidev, PCI_DEVICE_ID, &dev_id); - pci_read_config_byte(phba->pcidev, PCI_HEADER_TYPE, &hdrtype); switch (dev_id) { case PCI_DEVICE_ID_FIREFLY: @@ -871,8 +869,6 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp) break; case PCI_DEVICE_ID_LP11000S: case PCI_DEVICE_ID_LPE11000S: - pci_read_config_word(phba->pcidev, PCI_SUBSYSTEM_ID, - &dev_subid); switch (dev_subid) { case PCI_SUBSYSTEM_ID_LP11000S: model_str = "LP11002-S 4Gb PCI-X2";