treewide: devm_kzalloc() -> devm_kcalloc()

[linux-2.6-microblaze.git] / drivers / pinctrl / freescale / pinctrl-imx1-core.c

diff --git a/drivers/pinctrl/freescale/pinctrl-imx1-core.c b/drivers/pinctrl/freescale/pinctrl-imx1-core.c
index e7169ac..c3bdd90 100644 (file)
--- a/drivers/pinctrl/freescale/pinctrl-imx1-core.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx1-core.c
@@ -483,10 +483,10 @@ static int imx1_pinctrl_parse_groups(struct device_node *np,
        }
 
        grp->npins = size / 12;
-       grp->pins = devm_kzalloc(info->dev,
-                       grp->npins * sizeof(struct imx1_pin), GFP_KERNEL);
-       grp->pin_ids = devm_kzalloc(info->dev,
-                       grp->npins * sizeof(unsigned int), GFP_KERNEL);
+       grp->pins = devm_kcalloc(info->dev,
+                       grp->npins, sizeof(struct imx1_pin), GFP_KERNEL);
+       grp->pin_ids = devm_kcalloc(info->dev,
+                       grp->npins, sizeof(unsigned int), GFP_KERNEL);
 
        if (!grp->pins || !grp->pin_ids)
                return -ENOMEM;
@@ -523,8 +523,8 @@ static int imx1_pinctrl_parse_functions(struct device_node *np,
        if (func->num_groups == 0)
                return -EINVAL;
 
-       func->groups = devm_kzalloc(info->dev,
-                       func->num_groups * sizeof(char *), GFP_KERNEL);
+       func->groups = devm_kcalloc(info->dev,
+                       func->num_groups, sizeof(char *), GFP_KERNEL);
 
        if (!func->groups)
                return -ENOMEM;
@@ -566,12 +566,12 @@ static int imx1_pinctrl_parse_dt(struct platform_device *pdev,
        }
 
        info->nfunctions = nfuncs;
-       info->functions = devm_kzalloc(&pdev->dev,
-                       nfuncs * sizeof(struct imx1_pmx_func), GFP_KERNEL);
+       info->functions = devm_kcalloc(&pdev->dev,
+                       nfuncs, sizeof(struct imx1_pmx_func), GFP_KERNEL);
 
        info->ngroups = ngroups;
-       info->groups = devm_kzalloc(&pdev->dev,
-                       ngroups * sizeof(struct imx1_pin_group), GFP_KERNEL);
+       info->groups = devm_kcalloc(&pdev->dev,
+                       ngroups, sizeof(struct imx1_pin_group), GFP_KERNEL);
 
 
        if (!info->functions || !info->groups)