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: Krzysztof Kozlowski <[email protected]> --- drivers/spi/spi-virtio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-virtio.c b/drivers/spi/spi-virtio.c index 2acb929b2c69..6aad9f1fd016 100644 --- a/drivers/spi/spi-virtio.c +++ b/drivers/spi/spi-virtio.c @@ -150,7 +150,6 @@ static int virtio_spi_transfer_one(struct spi_controller *ctrl, struct spi_transfer *xfer) { struct virtio_spi_priv *priv = spi_controller_get_devdata(ctrl); - struct virtio_spi_req *spi_req __free(kfree) = NULL; struct spi_transfer_head *th; struct scatterlist sg_out_head, sg_out_payload; struct scatterlist sg_in_result, sg_in_payload; @@ -159,7 +158,8 @@ static int virtio_spi_transfer_one(struct spi_controller *ctrl, unsigned int incnt = 0; int ret; - spi_req = kzalloc(sizeof(*spi_req), GFP_KERNEL); + struct virtio_spi_req *spi_req __free(kfree) = kzalloc(sizeof(*spi_req), + GFP_KERNEL); if (!spi_req) return -ENOMEM; -- 2.51.0
