From 2a792e1c5fb2945d275066a777236425914953a9 Mon Sep 17 00:00:00 2001 From: Manish Rangankar Date: Fri, 7 Oct 2011 16:55:51 -0700 Subject: [PATCH] --- yaml --- r: 271119 b: refs/heads/master c: 0d5b36b8b427c84b4835fe8e00b218f46638e022 h: refs/heads/master i: 271117: 2dc3aeb05f9e62a5d5ac099934a6792d879dc60b 271115: bccf2b3732f6091bf8a9be7db318a6947bd5da73 271111: 8796c3b176b4dcba48d71d659617ad6e03d94b94 271103: c09c955e894276f830c6b8116c5c296d1b5e3b4c v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla4xxx/ql4_os.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 53b513155639..a3a78a67030b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69ca216e9bbbe2baf7f441ab57c5d791f439f775 +refs/heads/master: 0d5b36b8b427c84b4835fe8e00b218f46638e022 diff --git a/trunk/drivers/scsi/qla4xxx/ql4_os.c b/trunk/drivers/scsi/qla4xxx/ql4_os.c index fca3d2b96651..d39205c816d8 100644 --- a/trunk/drivers/scsi/qla4xxx/ql4_os.c +++ b/trunk/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;