Skip to content

Commit e8cb64d

Browse files
Dolev RavivChristoph Hellwig
authored andcommitted
scsi: ufs: fix static checker warning in ufshcd_parse_clock_info
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 <[email protected]> Reviewed-by: Maya Erez <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent eda910e commit e8cb64d

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

drivers/scsi/ufs/ufshcd-pltfrm.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
102102
clkfreq = devm_kzalloc(dev, sz * sizeof(*clkfreq),
103103
GFP_KERNEL);
104104
if (!clkfreq) {
105-
dev_err(dev, "%s: no memory\n", "freq-table-hz");
106105
ret = -ENOMEM;
107106
goto out;
108107
}
@@ -112,19 +111,19 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
112111
if (ret && (ret != -EINVAL)) {
113112
dev_err(dev, "%s: error reading array %d\n",
114113
"freq-table-hz", ret);
115-
goto free_clkfreq;
114+
return ret;
116115
}
117116

118117
for (i = 0; i < sz; i += 2) {
119118
ret = of_property_read_string_index(np,
120119
"clock-names", i/2, (const char **)&name);
121120
if (ret)
122-
goto free_clkfreq;
121+
goto out;
123122

124123
clki = devm_kzalloc(dev, sizeof(*clki), GFP_KERNEL);
125124
if (!clki) {
126125
ret = -ENOMEM;
127-
goto free_clkfreq;
126+
goto out;
128127
}
129128

130129
clki->min_freq = clkfreq[i];
@@ -134,8 +133,6 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba)
134133
clki->min_freq, clki->max_freq, clki->name);
135134
list_add_tail(&clki->list, &hba->clk_list_head);
136135
}
137-
free_clkfreq:
138-
kfree(clkfreq);
139136
out:
140137
return ret;
141138
}

0 commit comments

Comments
 (0)