From: Dolev Raviv <draviv@codeaurora.org>
To: James.Bottomley@HansenPartnership.com, hch@infradead.org
Cc: linux-scsi@vger.kernel.org, linux-arm-msm@vger.kernel.org,
santoshsy@gmail.com, Dolev Raviv <draviv@codeaurora.org>
Subject: [PATCH 6/6] scsi: ufs: fix static checker warning in ufshcd_parse_clock_info
Date: Thu, 23 Oct 2014 13:25:17 +0300 [thread overview]
Message-ID: <1414059917-13831-7-git-send-email-draviv@codeaurora.org> (raw)
In-Reply-To: <1414059917-13831-1-git-send-email-draviv@codeaurora.org>
This patch fixes newly introduced static checker warning in
ufshcd_parse_clock_info, introduced by UFS power management series.
Warning:
drivers/scsi/ufs/ufshcd-pltfrm.c:138 ufshcd_parse_clock_info()
warn: passing devm_ allocated variable to kfree. 'clkfreq'
To fix it we remove the kfree(clkfreq) statement.
In addition we removed the redundant goto label.
Signed-off-by: Dolev Raviv <draviv@codeaurora.org>
diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c
index 2cdec78..1c3467b 100644
--- a/drivers/scsi/ufs/ufshcd-pltfrm.c
+++ b/drivers/scsi/ufs/ufshcd-pltfrm.c
@@ -102,7 +102,6 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
clkfreq = devm_kzalloc(dev, sz * sizeof(*clkfreq),
GFP_KERNEL);
if (!clkfreq) {
- dev_err(dev, "%s: no memory\n", "freq-table-hz");
ret = -ENOMEM;
goto out;
}
@@ -112,19 +111,19 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
if (ret && (ret != -EINVAL)) {
dev_err(dev, "%s: error reading array %d\n",
"freq-table-hz", ret);
- goto free_clkfreq;
+ return ret;
}
for (i = 0; i < sz; i += 2) {
ret = of_property_read_string_index(np,
"clock-names", i/2, (const char **)&name);
if (ret)
- goto free_clkfreq;
+ goto out;
clki = devm_kzalloc(dev, sizeof(*clki), GFP_KERNEL);
if (!clki) {
ret = -ENOMEM;
- goto free_clkfreq;
+ goto out;
}
clki->min_freq = clkfreq[i];
@@ -134,8 +133,6 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
clki->min_freq, clki->max_freq, clki->name);
list_add_tail(&clki->list, &hba->clk_list_head);
}
-free_clkfreq:
- kfree(clkfreq);
out:
return ret;
}
--
1.8.5.2
--
Qualcomm Israel, on behalf of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2014-10-23 10:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-23 10:25 [PATCH 0/6] various fixes for UFS-PM series Dolev Raviv
2014-10-23 10:25 ` [PATCH 1/6] scsi: ufs: fix reference counting of W-LUs Dolev Raviv
2014-10-23 10:25 ` [PATCH 2/6] scsi: ufs: fix power info after link start-up Dolev Raviv
2014-10-23 10:25 ` [PATCH 3/6] scsi: ufs: fix static checker errors in ufshcd_system_suspend Dolev Raviv
2014-10-23 10:25 ` [PATCH 4/6] scsi: ufs: fix static checker warning in ufshcd_populate_vreg Dolev Raviv
2014-10-23 10:25 ` [PATCH 5/6] scsi: ufs: fix static checker warning in __ufshcd_setup_clocks Dolev Raviv
2014-10-23 10:25 ` Dolev Raviv [this message]
2014-10-23 17:15 ` [PATCH 0/6] various fixes for UFS-PM series Christoph Hellwig
2014-10-24 7:53 ` Dolev Raviv
2014-10-24 9:22 ` Christoph Hellwig
2014-10-26 11:04 ` Dolev Raviv
2014-10-27 9:50 ` Christoph Hellwig
2014-11-20 11:19 ` Dolev Raviv
2014-11-20 11:42 ` merez
2014-11-20 16:48 ` Christoph Hellwig
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=1414059917-13831-7-git-send-email-draviv@codeaurora.org \
--to=draviv@codeaurora.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=hch@infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=santoshsy@gmail.com \
/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