From fd802f03b93d0265c16691ff5663a78975a43b85 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 13 Apr 2019 22:43:13 +0000 Subject: [PATCH] qla2x00t-32gbit, target: Simplify sqa_get_target_name() This patch does not change any functionality. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8181 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c index 82f08ee91..489b8e376 100644 --- a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c +++ b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c @@ -1358,26 +1358,12 @@ static ssize_t sqa_abort_isp_store(struct kobject *kobj, static int sqa_get_target_name(uint8_t *wwn, char **ppwwn_name) { - const int wwn_len = 3*WWN_SIZE+2; - int res = 0; - char *name; + *ppwwn_name = kasprintf(GFP_KERNEL, + "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", + wwn[0], wwn[1], wwn[2], wwn[3], + wwn[4], wwn[5], wwn[6], wwn[7]); - name = kmalloc(wwn_len, GFP_KERNEL); - if (name == NULL) { - PRINT_ERROR("sqatgt: Allocation of tgt wwn name (size %d) " - "failed", wwn_len); - res = -ENOMEM; - goto out; - } - - sprintf(name, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", - wwn[0], wwn[1], wwn[2], wwn[3], - wwn[4], wwn[5], wwn[6], wwn[7]); - - *ppwwn_name = name; - -out: - return res; + return *ppwwn_name ? 0 : -ENOMEM; } static int sqa_parse_wwn(const char *ns, u64 *nm)