Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeda1bd6 authored by lixiubo's avatar lixiubo Committed by Mark Brown
Browse files

regmap: replace kzalloc with kcalloc 



Replace kzalloc with specialized function kcalloc when the size is
a multiplication of : number * sizeof

Signed-off-by: default avatarlixiubo <lixiubo@cmss.chinamobile.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8005c49d

drivers/base/regmap/regcache-flat.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static int regcache_flat_init(struct regmap *map) 
	int i;

	unsigned int *cache;



	map->cache = kzalloc(sizeof(unsigned int) * (map->max_register + 1),

	map->cache = kcalloc(map->max_register + 1, sizeof(unsigned int),

			     GFP_KERNEL);

	if (!map->cache)

		return -ENOMEM;

drivers/base/regmap/regcache-lzo.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static int regcache_lzo_init(struct regmap *map) 
	ret = 0;



	blkcount = regcache_lzo_block_count(map);

	map->cache = kzalloc(blkcount * sizeof *lzo_blocks,

	map->cache = kcalloc(blkcount, sizeof(*lzo_blocks),

			     GFP_KERNEL);

	if (!map->cache)

		return -ENOMEM;

drivers/base/regmap/regcache-rbtree.c

+3 −2
Original line number Diff line number Diff line
@@ -366,8 +366,9 @@ regcache_rbtree_node_alloc(struct regmap *map, unsigned int reg) 
	if (!rbnode->block)

		goto err_free;



	rbnode->cache_present = kzalloc(BITS_TO_LONGS(rbnode->blklen) *

		sizeof(*rbnode->cache_present), GFP_KERNEL);

	rbnode->cache_present = kcalloc(BITS_TO_LONGS(rbnode->blklen),

					sizeof(*rbnode->cache_present),

					GFP_KERNEL);

	if (!rbnode->cache_present)

		goto err_free_block;

drivers/base/regmap/regmap-irq.c

+4 −4
Original line number Diff line number Diff line
@@ -386,23 +386,23 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, 
	if (!d)

		return -ENOMEM;



	d->status_buf = kzalloc(sizeof(unsigned int) * chip->num_regs,

	d->status_buf = kcalloc(chip->num_regs, sizeof(unsigned int),

				GFP_KERNEL);

	if (!d->status_buf)

		goto err_alloc;



	d->mask_buf = kzalloc(sizeof(unsigned int) * chip->num_regs,

	d->mask_buf = kcalloc(chip->num_regs, sizeof(unsigned int),

			      GFP_KERNEL);

	if (!d->mask_buf)

		goto err_alloc;



	d->mask_buf_def = kzalloc(sizeof(unsigned int) * chip->num_regs,

	d->mask_buf_def = kcalloc(chip->num_regs, sizeof(unsigned int),

				  GFP_KERNEL);

	if (!d->mask_buf_def)

		goto err_alloc;



	if (chip->wake_base) {

		d->wake_buf = kzalloc(sizeof(unsigned int) * chip->num_regs,

		d->wake_buf = kcalloc(chip->num_regs, sizeof(unsigned int),

				      GFP_KERNEL);

		if (!d->wake_buf)

			goto err_alloc;