|
@@ -1085,8 +1085,8 @@ static int clk_fetch_parent_index(struct clk *clk, struct clk *parent)
|
|
|
int i;
|
|
|
|
|
|
if (!clk->parents) {
|
|
|
- clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents),
|
|
|
- GFP_KERNEL);
|
|
|
+ clk->parents = kcalloc(clk->num_parents,
|
|
|
+ sizeof(struct clk *), GFP_KERNEL);
|
|
|
if (!clk->parents)
|
|
|
return -ENOMEM;
|
|
|
}
|
|
@@ -1535,7 +1535,7 @@ static struct clk *__clk_init_parent(struct clk *clk)
|
|
|
|
|
|
if (!clk->parents)
|
|
|
clk->parents =
|
|
|
- kzalloc((sizeof(struct clk*) * clk->num_parents),
|
|
|
+ kcalloc(clk->num_parents, sizeof(struct clk *),
|
|
|
GFP_KERNEL);
|
|
|
|
|
|
ret = clk_get_parent_by_index(clk, index);
|
|
@@ -1692,8 +1692,8 @@ int __clk_init(struct device *dev, struct clk *clk)
|
|
|
* for clock drivers to statically initialize clk->parents.
|
|
|
*/
|
|
|
if (clk->num_parents > 1 && !clk->parents) {
|
|
|
- clk->parents = kzalloc((sizeof(struct clk*) * clk->num_parents),
|
|
|
- GFP_KERNEL);
|
|
|
+ clk->parents = kcalloc(clk->num_parents, sizeof(struct clk *),
|
|
|
+ GFP_KERNEL);
|
|
|
/*
|
|
|
* __clk_lookup returns NULL for parents that have not been
|
|
|
* clk_init'd; thus any access to clk->parents[] must check
|
|
@@ -1833,8 +1833,8 @@ static int _clk_register(struct device *dev, struct clk_hw *hw, struct clk *clk)
|
|
|
hw->clk = clk;
|
|
|
|
|
|
/* allocate local copy in case parent_names is __initdata */
|
|
|
- clk->parent_names = kzalloc((sizeof(char*) * clk->num_parents),
|
|
|
- GFP_KERNEL);
|
|
|
+ clk->parent_names = kcalloc(clk->num_parents, sizeof(char *),
|
|
|
+ GFP_KERNEL);
|
|
|
|
|
|
if (!clk->parent_names) {
|
|
|
pr_err("%s: could not allocate clk->parent_names\n", __func__);
|