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

i3c: adi: 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.

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


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

drivers/i3c/master/adi-i3c-master.c

+4 −6
Original line number Diff line number Diff line
@@ -332,10 +332,9 @@ static int adi_i3c_master_send_ccc_cmd(struct i3c_master_controller *m, 
				       struct i3c_ccc_cmd *cmd)

{

	struct adi_i3c_master *master = to_adi_i3c_master(m);

	struct adi_i3c_xfer *xfer __free(kfree) = NULL;

	struct adi_i3c_cmd *ccmd;



	xfer = adi_i3c_master_alloc_xfer(master, 1);

	struct adi_i3c_xfer *xfer __free(kfree) = adi_i3c_master_alloc_xfer(master, 1);

	if (!xfer)

		return -ENOMEM;
@@ -371,13 +370,12 @@ static int adi_i3c_master_i3c_xfers(struct i3c_dev_desc *dev, 
{

	struct i3c_master_controller *m = i3c_dev_get_master(dev);

	struct adi_i3c_master *master = to_adi_i3c_master(m);

	struct adi_i3c_xfer *xfer __free(kfree) = NULL;

	int i, ret;



	if (!nxfers)

		return 0;



	xfer = adi_i3c_master_alloc_xfer(master, nxfers);

	struct adi_i3c_xfer *xfer __free(kfree) = adi_i3c_master_alloc_xfer(master, nxfers);

	if (!xfer)

		return -ENOMEM;
@@ -777,7 +775,6 @@ static int adi_i3c_master_i2c_xfers(struct i2c_dev_desc *dev, 
{

	struct i3c_master_controller *m = i2c_dev_get_master(dev);

	struct adi_i3c_master *master = to_adi_i3c_master(m);

	struct adi_i3c_xfer *xfer __free(kfree) = NULL;

	int i;



	if (!nxfers)
@@ -786,7 +783,8 @@ static int adi_i3c_master_i2c_xfers(struct i2c_dev_desc *dev, 
		if (xfers[i].flags & I2C_M_TEN)

			return -EOPNOTSUPP;

	}

	xfer = adi_i3c_master_alloc_xfer(master, nxfers);



	struct adi_i3c_xfer *xfer __free(kfree) = adi_i3c_master_alloc_xfer(master, nxfers);

	if (!xfer)

		return -ENOMEM;