Skip to content

Commit 7d10ae3

Browse files
mtk-rex-bc-chenbebarino
authored andcommitted
clk: mediatek: reset: Change return type for clock reset register function
To deal with error handling, we change the function return type from void to int for mtk_clk_register_rst_ctrl(). Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Link: https://lore.kernel.org/r/20220523093346.28493-10-rex-bc.chen@mediatek.com Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 322989d commit 7d10ae3

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

drivers/clk/mediatek/reset.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ static int reset_xlate(struct reset_controller_dev *rcdev,
110110
return data->desc->rst_idx_map[reset_spec->args[0]];
111111
}
112112

113-
void mtk_register_reset_controller(struct device_node *np,
114-
const struct mtk_clk_rst_desc *desc)
113+
int mtk_register_reset_controller(struct device_node *np,
114+
const struct mtk_clk_rst_desc *desc)
115115
{
116116
struct regmap *regmap;
117117
const struct reset_control_ops *rcops = NULL;
@@ -120,7 +120,7 @@ void mtk_register_reset_controller(struct device_node *np,
120120

121121
if (!desc) {
122122
pr_err("mtk clock reset desc is NULL\n");
123-
return;
123+
return -EINVAL;
124124
}
125125

126126
switch (desc->version) {
@@ -132,18 +132,18 @@ void mtk_register_reset_controller(struct device_node *np,
132132
break;
133133
default:
134134
pr_err("Unknown reset version %d\n", desc->version);
135-
return;
135+
return -EINVAL;
136136
}
137137

138138
regmap = device_node_to_regmap(np);
139139
if (IS_ERR(regmap)) {
140140
pr_err("Cannot find regmap for %pOF: %pe\n", np, regmap);
141-
return;
141+
return -EINVAL;
142142
}
143143

144144
data = kzalloc(sizeof(*data), GFP_KERNEL);
145145
if (!data)
146-
return;
146+
return -ENOMEM;
147147

148148
data->desc = desc;
149149
data->regmap = regmap;
@@ -163,7 +163,10 @@ void mtk_register_reset_controller(struct device_node *np,
163163
if (ret) {
164164
pr_err("could not register reset controller: %d\n", ret);
165165
kfree(data);
166+
return ret;
166167
}
168+
169+
return 0;
167170
}
168171

169172
MODULE_LICENSE("GPL");

drivers/clk/mediatek/reset.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ struct mtk_clk_rst_data {
5656
* mtk_register_reset_controller - Register MediaTek clock reset controller
5757
* @np: Pointer to device node.
5858
* @desc: Constant pointer to description of clock reset.
59+
*
60+
* Return: 0 on success and errorno otherwise.
5961
*/
60-
void mtk_register_reset_controller(struct device_node *np,
61-
const struct mtk_clk_rst_desc *desc);
62+
int mtk_register_reset_controller(struct device_node *np,
63+
const struct mtk_clk_rst_desc *desc);
6264

6365
#endif /* __DRV_CLK_MTK_RESET_H */

0 commit comments

Comments
 (0)