iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clk: mediatek: reset: Change return type for clock reset register function

Browse Source 
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>
This commit is contained in:
Rex-BC Chen 2022-05-23 17:33:36 +08:00 committed by Stephen Boyd
parent 322989ddf7
commit 7d10ae3797
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/clk/mediatek/reset.c
View File

@ -110,8 +110,8 @@ static int reset_xlate(struct reset_controller_dev *rcdev,
return data->desc->rst_idx_map[reset_spec->args[0]];
}
void mtk_register_reset_controller(struct device_node *np,
const struct mtk_clk_rst_desc *desc)
int mtk_register_reset_controller(struct device_node *np,
const struct mtk_clk_rst_desc *desc)
{
struct regmap *regmap;
const struct reset_control_ops *rcops = NULL;
@ -120,7 +120,7 @@ void mtk_register_reset_controller(struct device_node *np,
if (!desc) {
pr_err("mtk clock reset desc is NULL\n");
return;
return -EINVAL;
}
switch (desc->version) {
@ -132,18 +132,18 @@ void mtk_register_reset_controller(struct device_node *np,
break;
default:
pr_err("Unknown reset version %d\n", desc->version);
return;
return -EINVAL;
}
regmap = device_node_to_regmap(np);
if (IS_ERR(regmap)) {
pr_err("Cannot find regmap for %pOF: %pe\n", np, regmap);
return;
return -EINVAL;
}
data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data)
return;
return -ENOMEM;
data->desc = desc;
data->regmap = regmap;
@ -163,7 +163,10 @@ void mtk_register_reset_controller(struct device_node *np,
if (ret) {
pr_err("could not register reset controller: %d\n", ret);
kfree(data);
return ret;
}
return 0;
}
MODULE_LICENSE("GPL");

6
drivers/clk/mediatek/reset.h
View File

@ -56,8 +56,10 @@ struct mtk_clk_rst_data {
* mtk_register_reset_controller - Register MediaTek clock reset controller
* @np: Pointer to device node.
* @desc: Constant pointer to description of clock reset.
*
* Return: 0 on success and errorno otherwise.
*/
void mtk_register_reset_controller(struct device_node *np,
const struct mtk_clk_rst_desc *desc);
int mtk_register_reset_controller(struct device_node *np,
const struct mtk_clk_rst_desc *desc);
#endif /* __DRV_CLK_MTK_RESET_H */