Commit cc3b18f9 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Alexandre Belloni
Browse files

i3c: master: Fix confusing cleanup.h syntax 



Initializing automatic __free variables to NULL without need (e.g.
branches with different allocations), followed by actual allocation is
in contrary to explicit coding rules guiding cleanup.h:

"Given that the "__free(...) = NULL" pattern for variables defined at
the top of the function poses this potential interdependency problem the
recommendation is to always define and assign variables in one statement
and not group variable definitions at the top of the function when
__free() is used."

Code does not have a bug, but is less readable and uses discouraged
coding practice, so fix that by moving declaration to the place of
assignment.

Not that other existing usage of __free() in this context is a corret
exception initialized to NULL, because the actual allocation is branched
in if().

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Link: https://patch.msgid.link/20251208020750.4727-3-krzysztof.kozlowski@oss.qualcomm.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 41b80d43

drivers/i3c/master.c

+1 −2
Original line number Diff line number Diff line
@@ -1742,11 +1742,10 @@ EXPORT_SYMBOL_GPL(i3c_master_do_daa); 
struct i3c_dma *i3c_master_dma_map_single(struct device *dev, void *buf,

	size_t len, bool force_bounce, enum dma_data_direction dir)

{

	struct i3c_dma *dma_xfer __free(kfree) = NULL;

	void *bounce __free(kfree) = NULL;

	void *dma_buf = buf;



	dma_xfer = kzalloc(sizeof(*dma_xfer), GFP_KERNEL);

	struct i3c_dma *dma_xfer __free(kfree) = kzalloc(sizeof(*dma_xfer), GFP_KERNEL);

	if (!dma_xfer)

		return NULL;