From 0d5b36b8b427c84b4835fe8e00b218f46638e022 Mon Sep 17 00:00:00 2001 From: Manish Rangankar Date: Fri, 7 Oct 2011 16:55:51 -0700 Subject: [PATCH] [SCSI] qla4xxx: updated device id check for BFS. JIRA Key: UPSISCSI-75 Signed-off-by: Manish Rangankar Signed-off-by: Vikas Chaudhary Reviewed-by: Mike Christie Signed-off-by: James Bottomley --- drivers/scsi/qla4xxx/ql4_os.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index fca3d2b96651..d39205c816d8 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -2782,12 +2782,10 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[]) func_num = PCI_FUNC(ha->pdev->devfn); - DEBUG2(ql4_printk(KERN_INFO, ha, - "%s: Get FW boot info for 0x%x func %d\n", __func__, - (is_qla4032(ha) ? PCI_DEVICE_ID_QLOGIC_ISP4032 : - PCI_DEVICE_ID_QLOGIC_ISP8022), func_num)); + ql4_printk(KERN_INFO, ha, "%s: Get FW boot info for 0x%x func %d\n", + __func__, ha->pdev->device, func_num); - if (is_qla4032(ha)) { + if (is_qla40XX(ha)) { if (func_num == 1) { addr = NVRAM_PORT0_BOOT_MODE; pri_addr = NVRAM_PORT0_BOOT_PRI_TGT; -- 2.39.5