i3c: master: use kzalloc_flex
PATCH 1/1 i3c: master: use kzalloc_flex
Simplifies allocations by using a flexible array member in this struct.
Add __counted_by to get extra runtime analysis.
Signed-off-by Rosen Penev <[email protected]>
--- drivers/i3c/master.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/i3c/master.c +4 -10
@@ -2793,10 +2793,10 @@ struct i3c_generic_ibi_slot {struct i3c_generic_ibi_pool {spinlock_t lock;unsigned int num_slots; -struct i3c_generic_ibi_slot *slots;void *payload_buf;struct list_head free_slots;struct list_head pending; + struct i3c_generic_ibi_slot slots[] __counted_by(num_slots); };/**
@@ -2824,7 +2824,6 @@ void i3c_generic_ibi_free_pool(struct i3c_generic_ibi_pool *pool)WARN_ON (nslots != pool->num_slots);kfree (pool->payload_buf); -kfree (pool->slots);kfree (pool); }EXPORT_SYMBOL_GPL (i3c_generic_ibi_free_pool);
@@ -2847,20 +2846,16 @@ i3c_generic_ibi_alloc_pool(struct i3c_dev_desc *dev,unsigned int i;int ret; - pool =kzalloc_obj (*pool); + pool =kzalloc_flex (*pool, slots, req->num_slots);if (!pool)return ERR_PTR (-ENOMEM ); + pool->num_slots = req->num_slots; +spin_lock_init (&pool->lock);INIT_LIST_HEAD (&pool->free_slots);INIT_LIST_HEAD (&pool->pending); - pool->slots =kzalloc_objs (*slot, req->num_slots); -if (!pool->slots) { - ret = -ENOMEM ; - goto err_free_pool; - } -if (req->max_payload_len) { pool->payload_buf =kcalloc (req->num_slots, req->max_payload_len,GFP_KERNEL );
@@ -2879,7 +2874,6 @@ i3c_generic_ibi_alloc_pool(struct i3c_dev_desc *dev, (i * req->max_payload_len);list_add_tail (&slot->node, &pool->free_slots); - pool->num_slots++; }return pool;
Signature · 1 line
2.53.0
Quoted 6 lines · Rosen Penev
Simplifies allocations by using a flexible array member in this struct.
Add
__counted_byto get extra runtime analysis.Signed-off-by Rosen Penev <[email protected]>---
Reviewed-by Frank Li <[email protected]>
Quoted 1 line
Quoted 1 line · Rosen Penev
i3c: master: use
kzalloc_flex
Applied, thanks!
[1/1] i3c: master: use kzalloc_flex
https://git.kernel.org/i3c/c/8ecd876fdaed
Best regards,