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

pinctrl: freescale: Use scope based of_node_put() cleanups

Browse Source 
Use scope based of_node_put() cleanup to simplify code.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/20240627131721.678727-4-peng.fan@oss.nxp.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Peng Fan 2024-06-27 21:17:21 +08:00 committed by Linus Walleij
parent 2677d53d5c
commit cb3cb99a7f
3 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/pinctrl/freescale/pinctrl-imx.c
View File

@ -580,7 +580,6 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
u32 index) u32 index)
{ {
struct pinctrl_dev *pctl = ipctl->pctl; struct pinctrl_dev *pctl = ipctl->pctl;
struct device_node *child;
struct function_desc *func; struct function_desc *func;
struct group_desc *grp; struct group_desc *grp;
const char **group_names; const char **group_names;
@ -605,17 +604,15 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
if (!group_names) if (!group_names)
return -ENOMEM; return -ENOMEM;
i = 0; i = 0;
for_each_child_of_node(np, child) for_each_child_of_node_scoped(np, child)
group_names[i++] = child->name; group_names[i++] = child->name;
func->func.groups = group_names; func->func.groups = group_names;
i = 0; i = 0;
for_each_child_of_node(np, child) { for_each_child_of_node_scoped(np, child) {
grp = devm_kzalloc(ipctl->dev, sizeof(*grp), GFP_KERNEL); grp = devm_kzalloc(ipctl->dev, sizeof(*grp), GFP_KERNEL);
if (!grp) { if (!grp)
of_node_put(child);
return -ENOMEM; return -ENOMEM;
}
mutex_lock(&ipctl->mutex); mutex_lock(&ipctl->mutex);
radix_tree_insert(&pctl->pin_group_tree, radix_tree_insert(&pctl->pin_group_tree,
@ -635,21 +632,13 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
*/ */
static bool imx_pinctrl_dt_is_flat_functions(struct device_node *np) static bool imx_pinctrl_dt_is_flat_functions(struct device_node *np)
{ {
struct device_node *function_np; for_each_child_of_node_scoped(np, function_np) {
struct device_node *pinctrl_np; if (of_property_read_bool(function_np, "fsl,pins"))
for_each_child_of_node(np, function_np) {
if (of_property_read_bool(function_np, "fsl,pins")) {
of_node_put(function_np);
return true; return true;
}
for_each_child_of_node(function_np, pinctrl_np) { for_each_child_of_node_scoped(function_np, pinctrl_np) {
if (of_property_read_bool(pinctrl_np, "fsl,pins")) { if (of_property_read_bool(pinctrl_np, "fsl,pins"))
of_node_put(pinctrl_np);
of_node_put(function_np);
return false; return false;
}
} }
} }

16
drivers/pinctrl/freescale/pinctrl-imx1-core.c
View File

@ -508,7 +508,6 @@ static int imx1_pinctrl_parse_functions(struct device_node *np,
struct imx1_pinctrl_soc_info *info, struct imx1_pinctrl_soc_info *info,
u32 index) u32 index)
{ {
struct device_node *child;
struct imx1_pmx_func *func; struct imx1_pmx_func *func;
struct imx1_pin_group *grp; struct imx1_pin_group *grp;
int ret; int ret;
@ -531,14 +530,12 @@ static int imx1_pinctrl_parse_functions(struct device_node *np,
if (!func->groups) if (!func->groups)
return -ENOMEM; return -ENOMEM;
for_each_child_of_node(np, child) { for_each_child_of_node_scoped(np, child) {
func->groups[i] = child->name; func->groups[i] = child->name;
grp = &info->groups[grp_index++]; grp = &info->groups[grp_index++];
ret = imx1_pinctrl_parse_groups(child, grp, info, i++); ret = imx1_pinctrl_parse_groups(child, grp, info, i++);
if (ret == -ENOMEM) { if (ret == -ENOMEM)
of_node_put(child);
return ret; return ret;
}
} }
return 0; return 0;
@ -548,7 +545,6 @@ static int imx1_pinctrl_parse_dt(struct platform_device *pdev,
struct imx1_pinctrl *pctl, struct imx1_pinctrl_soc_info *info) struct imx1_pinctrl *pctl, struct imx1_pinctrl_soc_info *info)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct device_node *child;
int ret; int ret;
u32 nfuncs = 0; u32 nfuncs = 0;
u32 ngroups = 0; u32 ngroups = 0;
@ -557,7 +553,7 @@ static int imx1_pinctrl_parse_dt(struct platform_device *pdev,
if (!np) if (!np)
return -ENODEV; return -ENODEV;
for_each_child_of_node(np, child) { for_each_child_of_node_scoped(np, child) {
++nfuncs; ++nfuncs;
ngroups += of_get_child_count(child); ngroups += of_get_child_count(child);
} }
@ -579,12 +575,10 @@ static int imx1_pinctrl_parse_dt(struct platform_device *pdev,
if (!info->functions || !info->groups) if (!info->functions || !info->groups)
return -ENOMEM; return -ENOMEM;
for_each_child_of_node(np, child) { for_each_child_of_node_scoped(np, child) {
ret = imx1_pinctrl_parse_functions(child, info, ifunc++); ret = imx1_pinctrl_parse_functions(child, info, ifunc++);
if (ret == -ENOMEM) { if (ret == -ENOMEM)
of_node_put(child);
return -ENOMEM; return -ENOMEM;
}
} }
return 0; return 0;

14
drivers/pinctrl/freescale/pinctrl-mxs.c
View File

@ -490,16 +490,14 @@ static int mxs_pinctrl_probe_dt(struct platform_device *pdev,
/* Get groups for each function */ /* Get groups for each function */
idxf = 0; idxf = 0;
fn = fnull; fn = fnull;
for_each_child_of_node(np, child) { for_each_child_of_node_scoped(np, child) {
if (is_mxs_gpio(child)) if (is_mxs_gpio(child))
continue; continue;
if (of_property_read_u32(child, "reg", &val)) { if (of_property_read_u32(child, "reg", &val)) {
ret = mxs_pinctrl_parse_group(pdev, child, ret = mxs_pinctrl_parse_group(pdev, child,
idxg++, NULL); idxg++, NULL);
if (ret) { if (ret)
of_node_put(child);
return ret; return ret;
}
continue; continue;
} }
@ -509,19 +507,15 @@ static int mxs_pinctrl_probe_dt(struct platform_device *pdev,
f->ngroups, f->ngroups,
sizeof(*f->groups), sizeof(*f->groups),
GFP_KERNEL); GFP_KERNEL);
if (!f->groups) { if (!f->groups)
of_node_put(child);
return -ENOMEM; return -ENOMEM;
}
fn = child->name; fn = child->name;
i = 0; i = 0;
} }
ret = mxs_pinctrl_parse_group(pdev, child, idxg++, ret = mxs_pinctrl_parse_group(pdev, child, idxg++,
&f->groups[i++]); &f->groups[i++]);
if (ret) { if (ret)
of_node_put(child);
return ret; return ret;
}
} }
return 0; return 0;