From: Saurav Kashyap <saurav.kashyap@qlogic.com>
To: jbottomley@parallels.com
Cc: giridhar.malavali@qlogic.com, saurav.kashyap@qlogic.com,
andrew.vasquez@qlogic.com, linux-scsi@vger.kernel.org
Subject: [PATCH 10/16] qla2xxx: Remove two superfluous tests.
Date: Tue, 25 Jun 2013 11:27:25 -0400 [thread overview]
Message-ID: <1372174051-4211-11-git-send-email-saurav.kashyap@qlogic.com> (raw)
In-Reply-To: <1372174051-4211-1-git-send-email-saurav.kashyap@qlogic.com>
From: Bart Van Assche <bvanassche@acm.org>
Since ha->model_desc is an array comparing it against NULL is
superfluous. Hence remove these tests.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
---
drivers/scsi/qla2xxx/qla_gs.c | 3 +--
drivers/scsi/qla2xxx/qla_os.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index d0ea8b9..f26442a 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -1370,8 +1370,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha)
/* Model description. */
eiter = (struct ct_fdmi_hba_attr *) (entries + size);
eiter->type = __constant_cpu_to_be16(FDMI_HBA_MODEL_DESCRIPTION);
- if (ha->model_desc)
- strncpy(eiter->a.model_desc, ha->model_desc, 80);
+ strncpy(eiter->a.model_desc, ha->model_desc, 80);
alen = strlen(eiter->a.model_desc);
alen += (alen & 3) ? (4 - (alen & 3)) : 4;
eiter->len = cpu_to_be16(4 + alen);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index c2e2e20..6df5223 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2839,8 +2839,7 @@ skip_dpc:
qla2x00_dfs_setup(base_vha);
ql_log(ql_log_info, base_vha, 0x00fb,
- "QLogic %s - %s.\n",
- ha->model_number, ha->model_desc ? ha->model_desc : "");
+ "QLogic %s - %s.\n", ha->model_number, ha->model_desc);
ql_log(ql_log_info, base_vha, 0x00fc,
"ISP%04X: %s @ %s hdma%c host#=%ld fw=%s.\n",
pdev->device, ha->isp_ops->pci_info_str(base_vha, pci_info),
--
1.7.7
next prev parent reply other threads:[~2013-06-25 15:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-25 15:27 [PATCH 00/16] qla2xxx: Patches for scsi "misc" branch Saurav Kashyap
2013-06-25 15:27 ` [PATCH 01/16] qla2xxx: Clear the MBX_INTR_WAIT flag when the mailbox time-out happens Saurav Kashyap
2013-06-25 15:27 ` [PATCH 02/16] qla2xxx: Set the index in outstanding command array to NULL when cmd is aborted when the request timeout Saurav Kashyap
2013-06-25 15:27 ` [PATCH 03/16] qla2xxx: Move qla2x00_free_device to the correct location Saurav Kashyap
2013-06-25 15:27 ` [PATCH 04/16] qla2xxx: Do not query FC statistics during chip reset Saurav Kashyap
2013-06-25 15:27 ` [PATCH 05/16] qla2xxx: Do not take a second firmware dump when intentionally generating one Saurav Kashyap
2013-06-25 15:27 ` [PATCH 06/16] qla2xxx: Fix sparse warning from qla_mr.c and qla_iocb.c Saurav Kashyap
2013-06-25 15:27 ` [PATCH 07/16] qla2xxx: Clean up qla24xx_iidma() Saurav Kashyap
2013-06-25 15:27 ` [PATCH 08/16] qla2xxx: Clean up qla84xx_mgmt_cmd() Saurav Kashyap
2013-06-25 15:27 ` [PATCH 09/16] qla2xxx: Remove dead code in qla2x00_configure_hba() Saurav Kashyap
2013-06-25 15:27 ` Saurav Kashyap [this message]
2013-06-25 15:27 ` [PATCH 11/16] qla2xxx: Remove a dead assignment in qla24xx_build_scsi_crc_2_iocbs() Saurav Kashyap
2013-06-25 15:27 ` [PATCH 12/16] qla2xxx: Remove redundant assignments Saurav Kashyap
2013-06-25 15:27 ` [PATCH 13/16] qla2xxx: Help Coverity with analyzing ct_sns_pkt initialization Saurav Kashyap
2013-06-25 15:27 ` [PATCH 14/16] qla2xxx: Fix qla2xxx_check_risc_status() Saurav Kashyap
2013-06-25 15:27 ` [PATCH 15/16] qla2xxx: Remove an unused variable from qla2x00_remove_one() Saurav Kashyap
2013-06-25 15:27 ` [PATCH 16/16] qla2xxx: Fix a memory leak in an error path of qla2x00_process_els() Saurav Kashyap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372174051-4211-11-git-send-email-saurav.kashyap@qlogic.com \
--to=saurav.kashyap@qlogic.com \
--cc=andrew.vasquez@qlogic.com \
--cc=giridhar.malavali@qlogic.com \
--cc=jbottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).