evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scsi: ufs: fix static checker warning in ufshcd_parse_clock_info

Browse source 
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>
Reviewed-by: Maya Erez <merez@codeaurora.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Dolev Raviv 2014-10-23 13:25:17 +03:00 • committed by Christoph Hellwig
parent eda910e4d0
commit e8cb64db81
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/scsi/ufs/ufshcd-pltfrm.c
View file

@ -102,7 +102,6 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
clkfreq = devm_kzalloc(dev, sz * sizeof(*clkfreq), clkfreq = devm_kzalloc(dev, sz * sizeof(*clkfreq),
GFP_KERNEL); GFP_KERNEL);
if (!clkfreq) { if (!clkfreq) {
dev_err(dev, "%s: no memory\n", "freq-table-hz");
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
@ -112,19 +111,19 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
if (ret && (ret != -EINVAL)) { if (ret && (ret != -EINVAL)) {
dev_err(dev, "%s: error reading array %d\n", dev_err(dev, "%s: error reading array %d\n",
"freq-table-hz", ret); "freq-table-hz", ret);
goto free_clkfreq; return ret;
} }
for (i = 0; i < sz; i += 2) { for (i = 0; i < sz; i += 2) {
ret = of_property_read_string_index(np, ret = of_property_read_string_index(np,
"clock-names", i/2, (const char **)&name); "clock-names", i/2, (const char **)&name);
if (ret) if (ret)
goto free_clkfreq; goto out;
clki = devm_kzalloc(dev, sizeof(*clki), GFP_KERNEL); clki = devm_kzalloc(dev, sizeof(*clki), GFP_KERNEL);
if (!clki) { if (!clki) {
ret = -ENOMEM; ret = -ENOMEM;
goto free_clkfreq; goto out;
} }
clki->min_freq = clkfreq[i]; 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); clki->min_freq, clki->max_freq, clki->name);
list_add_tail(&clki->list, &hba->clk_list_head); list_add_tail(&clki->list, &hba->clk_list_head);
} }
free_clkfreq:
kfree(clkfreq);
out: out:
return ret; return ret;
} }