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

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

regmap: replace kmalloc with kmalloc_array 



Replace kmalloc with specialized function kmalloc_array when the size
is a multiplication of : number * size

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

drivers/base/regmap/regcache-lzo.c

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int regcache_lzo_init(struct regmap *map) 
	 * that register.

	 */

	bmp_size = map->num_reg_defaults_raw;

	sync_bmp = kmalloc(BITS_TO_LONGS(bmp_size) * sizeof(long),

	sync_bmp = kmalloc_array(BITS_TO_LONGS(bmp_size), sizeof(long),

				 GFP_KERNEL);

	if (!sync_bmp) {

		ret = -ENOMEM;

drivers/base/regmap/regcache-rbtree.c

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ regcache_rbtree_node_alloc(struct regmap *map, unsigned int reg) 
		rbnode->base_reg = reg;

	}



	rbnode->block = kmalloc(rbnode->blklen * map->cache_word_size,

	rbnode->block = kmalloc_array(rbnode->blklen, map->cache_word_size,

				      GFP_KERNEL);

	if (!rbnode->block)

		goto err_free;

drivers/base/regmap/regmap-irq.c

+3 −2
Original line number Diff line number Diff line
@@ -422,8 +422,9 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags, 


	if (!map->use_single_read && map->reg_stride == 1 &&

	    d->irq_reg_stride == 1) {

		d->status_reg_buf = kmalloc(map->format.val_bytes *

					    chip->num_regs, GFP_KERNEL);

		d->status_reg_buf = kmalloc_array(chip->num_regs,

						  map->format.val_bytes,

						  GFP_KERNEL);

		if (!d->status_reg_buf)

			goto err_alloc;

	}