tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

clk: qcom: smd-rpm: Drop the use of struct rpm_cc

Considering that struct rpm_cc is now identical to rpm_smd_clk_desc,
and function qcom_smdrpm_clk_hw_get() uses rpm_cc in a read-only manner,
rpm_cc can be dropped by getting the function use rpm_smd_clk_desc
directly.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211031020715.21636-3-shawn.guo@linaro.org

authored by

Shawn Guo and committed by
Bjorn Andersson b406f5e9 00a123e9

+4 -17
+4 -17
drivers/clk/qcom/clk-smd-rpm.c
··· 150 150 __le32 value; 151 151 }; 152 152 153 - struct rpm_cc { 154 - struct clk_smd_rpm **clks; 155 - size_t num_clks; 156 - }; 157 - 158 153 struct rpm_smd_clk_desc { 159 154 struct clk_smd_rpm **clks; 160 155 size_t num_clks; ··· 1152 1157 static struct clk_hw *qcom_smdrpm_clk_hw_get(struct of_phandle_args *clkspec, 1153 1158 void *data) 1154 1159 { 1155 - struct rpm_cc *rcc = data; 1160 + const struct rpm_smd_clk_desc *desc = data; 1156 1161 unsigned int idx = clkspec->args[0]; 1157 1162 1158 - if (idx >= rcc->num_clks) { 1163 + if (idx >= desc->num_clks) { 1159 1164 pr_err("%s: invalid index %u\n", __func__, idx); 1160 1165 return ERR_PTR(-EINVAL); 1161 1166 } 1162 1167 1163 - return rcc->clks[idx] ? &rcc->clks[idx]->hw : ERR_PTR(-ENOENT); 1168 + return desc->clks[idx] ? &desc->clks[idx]->hw : ERR_PTR(-ENOENT); 1164 1169 } 1165 1170 1166 1171 static int rpm_smd_clk_probe(struct platform_device *pdev) 1167 1172 { 1168 - struct rpm_cc *rcc; 1169 1173 int ret; 1170 1174 size_t num_clks, i; 1171 1175 struct qcom_smd_rpm *rpm; ··· 1183 1189 1184 1190 rpm_smd_clks = desc->clks; 1185 1191 num_clks = desc->num_clks; 1186 - 1187 - rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc), GFP_KERNEL); 1188 - if (!rcc) 1189 - return -ENOMEM; 1190 - 1191 - rcc->clks = rpm_smd_clks; 1192 - rcc->num_clks = num_clks; 1193 1192 1194 1193 for (i = 0; i < num_clks; i++) { 1195 1194 if (!rpm_smd_clks[i]) ··· 1209 1222 } 1210 1223 1211 1224 ret = devm_of_clk_add_hw_provider(&pdev->dev, qcom_smdrpm_clk_hw_get, 1212 - rcc); 1225 + (void *)desc); 1213 1226 if (ret) 1214 1227 goto err; 1215 1228