Unverified Commit 6ecea208 authored by Rosen Penev's avatar Rosen Penev Committed by Andi Shyti
Browse files

i2c: atr: use kzalloc_flex 



Convert kzalloc_obj + kcalloc to kzalloc_flex to save an allocation.

Add __counted_by to get extra runtime analysis.

Signed-off-by: default avatarRosen Penev <rosenp@gmail.com>
Reviewed-by: default avatarLuca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20260327030310.8502-1-rosenp@gmail.com
parent 5dd75dac

drivers/i2c/i2c-atr.c

+4 −13
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ struct i2c_atr_alias_pair { 
 * @shared:   Indicates if this alias pool is shared by multiple channels

 *

 * @lock:     Lock protecting @aliases and @use_mask

 * @aliases:  Array of aliases, must hold exactly @size elements

 * @use_mask: Mask of used aliases

 * @aliases:  Array of aliases, must hold exactly @size elements

 */

struct i2c_atr_alias_pool {

	size_t size;
@@ -58,8 +58,8 @@ struct i2c_atr_alias_pool { 


	/* Protects aliases and use_mask */

	spinlock_t lock;

	u16 *aliases;

	unsigned long *use_mask;

	u16 aliases[] __counted_by(size);

};



/**
@@ -137,22 +137,16 @@ static struct i2c_atr_alias_pool *i2c_atr_alloc_alias_pool(size_t num_aliases, b 
	struct i2c_atr_alias_pool *alias_pool;

	int ret;



	alias_pool = kzalloc_obj(*alias_pool);

	alias_pool = kzalloc_flex(*alias_pool, aliases, num_aliases);

	if (!alias_pool)

		return ERR_PTR(-ENOMEM);



	alias_pool->size = num_aliases;



	alias_pool->aliases = kcalloc(num_aliases, sizeof(*alias_pool->aliases), GFP_KERNEL);

	if (!alias_pool->aliases) {

		ret = -ENOMEM;

		goto err_free_alias_pool;

	}



	alias_pool->use_mask = bitmap_zalloc(num_aliases, GFP_KERNEL);

	if (!alias_pool->use_mask) {

		ret = -ENOMEM;

		goto err_free_aliases;

		goto err_free_alias_pool;

	}



	alias_pool->shared = shared;
@@ -161,8 +155,6 @@ static struct i2c_atr_alias_pool *i2c_atr_alloc_alias_pool(size_t num_aliases, b 


	return alias_pool;



err_free_aliases:

	kfree(alias_pool->aliases);

err_free_alias_pool:

	kfree(alias_pool);

	return ERR_PTR(ret);
@@ -171,7 +163,6 @@ static struct i2c_atr_alias_pool *i2c_atr_alloc_alias_pool(size_t num_aliases, b 
static void i2c_atr_free_alias_pool(struct i2c_atr_alias_pool *alias_pool)

{

	bitmap_free(alias_pool->use_mask);

	kfree(alias_pool->aliases);

	kfree(alias_pool);

}