From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87AB82F5A3D for ; Wed, 19 Nov 2025 04:25:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763526347; cv=none; b=szdOHFmJ+qxQgSoaRXdA2WNl+HXzA1n1adtuUk5enumcQHN0I51R+EfNurkwrfMPEKInPeCeQ7fMTwH8Rxu3El3ZqY37BE0mb6AYhqWbUXbFr0lCdZAznrGmvHQhSMvG6BFyTs24wiZ7Zjk5LKqGJLEeHi6MKiBssk165U8iQbA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763526347; c=relaxed/simple; bh=5NUn1LCwTp9tUkZ5yCmDpmqm+8BVkuT6DOurvX908DM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=cGeC9M8Z2yTcO/I3btJNt9Htq77/fM2ruvkXDOLVveZ/2cgEnwT5vf6N6pqqJanDN8WkpJck2jRIu3pcLfJD1OzbSZQCMCRgtR4Zm96RtE8VrKhzYLmDuKmIEEaMlBvTNC3amthm/3tk3gruKq6kYlOFrXq8qNhrb6mVJW+rO7U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=UkdmORvi; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="UkdmORvi" Received: from pendragon.ideasonboard.com (unknown [205.220.129.225]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id E7AD614B0; Wed, 19 Nov 2025 05:23:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1763526219; bh=5NUn1LCwTp9tUkZ5yCmDpmqm+8BVkuT6DOurvX908DM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=UkdmORviwjBP2Fj9Gg+TJ3QY5phM3nzBW/9SnShhGed5oMpfYIK1KLrdGbEk/sAy9 5XQXVGgFlVhLdFCewj1GziQ3JNcP/Ooc+3zp+FI/C+7DmagpEPvvtYBLdAOXfUqQ+S lU5YQ7eogsZfP6iP+l3skRrDYfzc91nWs8Vb3UdU= Date: Wed, 19 Nov 2025 13:25:05 +0900 From: Laurent Pinchart To: Frank Li Cc: Philipp Zabel , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rui Miguel Silva , Martin Kepplinger-Novakovic , Purism Kernel Team , linux-media@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 4/4] media: nxp: use cleanup __free(fwnode_handle) simplify code Message-ID: <20251119042505.GO10711@pendragon.ideasonboard.com> References: <20251117-cam_cleanup-v1-0-6cd42872db79@nxp.com> <20251117-cam_cleanup-v1-4-6cd42872db79@nxp.com> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20251117-cam_cleanup-v1-4-6cd42872db79@nxp.com> Hi Frank, Thank you for the patch. On Mon, Nov 17, 2025 at 01:58:14PM -0500, Frank Li wrote: > Use cleanup __free(fwnode_handle) simplify code. Change to dev_err_probe() > because replace goto with return. > > Add missed "\n" at error message. > > No functional change. > > Signed-off-by: Frank Li > --- > drivers/media/platform/nxp/imx-mipi-csis.c | 31 +++++++++------------------ > drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 31 +++++++++------------------ > 2 files changed, 20 insertions(+), 42 deletions(-) > > diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c > index ce93d868746f002c22e2f86b1e0aa84ec1a76061..d924adb406a30797b66f0094ab17e98ad44fefac 100644 > --- a/drivers/media/platform/nxp/imx-mipi-csis.c > +++ b/drivers/media/platform/nxp/imx-mipi-csis.c > @@ -12,6 +12,7 @@ > * > */ > > +#include > #include > #include > #include > @@ -1349,28 +1350,25 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis) > .bus_type = V4L2_MBUS_CSI2_DPHY, > }; > struct v4l2_async_connection *asd; uuu> - struct fwnode_handle *ep; > unsigned int i; > int ret; > > v4l2_async_subdev_nf_init(&csis->notifier, &csis->sd); > > - ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(csis->dev), 0, 0, > - FWNODE_GRAPH_ENDPOINT_NEXT); > + struct fwnode_handle *ep __free(fwnode_handle) = > + fwnode_graph_get_endpoint_by_id(dev_fwnode(csis->dev), 0, 0, > + FWNODE_GRAPH_ENDPOINT_NEXT); Let's avoid mixing variable declarations and code, this is a style change that is not widely accepted (yet). You can write struct fwnode_handle *ep __free(fwnode_handle) = NULL; struct v4l2_async_connection *asd; unsigned int i; int ret; v4l2_async_subdev_nf_init(&csis->notifier, &csis->sd); ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(csis->dev), 0, 0, FWNODE_GRAPH_ENDPOINT_NEXT); > if (!ep) > return -ENOTCONN; > > ret = v4l2_fwnode_endpoint_parse(ep, &vep); > if (ret) > - goto err_parse; > + return ret; > > for (i = 0; i < vep.bus.mipi_csi2.num_data_lanes; ++i) { > - if (vep.bus.mipi_csi2.data_lanes[i] != i + 1) { > - dev_err(csis->dev, > - "data lanes reordering is not supported"); > - ret = -EINVAL; > - goto err_parse; > - } > + if (vep.bus.mipi_csi2.data_lanes[i] != i + 1) > + return dev_err_probe(csis->dev, -EINVAL, > + "data lanes reordering is not supported\n"); To switch to dev_err_probe(), we should drop the error message in the probe() function when mipi_csis_async_register() fails, and make sure every error path in this function prints a message. I'd prefer splitting that to a separate patch. > } > > csis->bus = vep.bus.mipi_csi2; > @@ -1381,12 +1379,8 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis) > > asd = v4l2_async_nf_add_fwnode_remote(&csis->notifier, ep, > struct v4l2_async_connection); > - if (IS_ERR(asd)) { > - ret = PTR_ERR(asd); > - goto err_parse; > - } > - > - fwnode_handle_put(ep); > + if (IS_ERR(asd)) > + return PTR_ERR(asd); > > csis->notifier.ops = &mipi_csis_notify_ops; > > @@ -1395,11 +1389,6 @@ static int mipi_csis_async_register(struct mipi_csis_device *csis) > return ret; > > return v4l2_async_register_subdev(&csis->sd); > - > -err_parse: > - fwnode_handle_put(ep); > - > - return ret; > } > > /* ----------------------------------------------------------------------------- > diff --git a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c > index 75709161fb26a61239b94430365849e022fdc14f..94882568405db55593c5c51722db2233a64d53e4 100644 > --- a/drivers/media/platform/nxp/imx8mq-mipi-csi2.c > +++ b/drivers/media/platform/nxp/imx8mq-mipi-csi2.c > @@ -6,6 +6,7 @@ > */ > > #include > +#include > #include > #include > #include > @@ -717,28 +718,25 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state) > .bus_type = V4L2_MBUS_CSI2_DPHY, > }; > struct v4l2_async_connection *asd; > - struct fwnode_handle *ep; > unsigned int i; > int ret; > > v4l2_async_subdev_nf_init(&state->notifier, &state->sd); > > - ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(state->dev), 0, 0, > - FWNODE_GRAPH_ENDPOINT_NEXT); > + struct fwnode_handle *ep __free(fwnode_handle) = > + fwnode_graph_get_endpoint_by_id(dev_fwnode(state->dev), 0, 0, > + FWNODE_GRAPH_ENDPOINT_NEXT); Same comment as above. > if (!ep) > return -ENOTCONN; > > ret = v4l2_fwnode_endpoint_parse(ep, &vep); > if (ret) > - goto err_parse; > + return ret; > > for (i = 0; i < vep.bus.mipi_csi2.num_data_lanes; ++i) { > - if (vep.bus.mipi_csi2.data_lanes[i] != i + 1) { > - dev_err(state->dev, > - "data lanes reordering is not supported"); > - ret = -EINVAL; > - goto err_parse; > - } > + if (vep.bus.mipi_csi2.data_lanes[i] != i + 1) > + return dev_err_probe(state->dev, -EINVAL, > + "data lanes reordering is not supported\n"); And here too. Usage of __free(fwnode_handle) looks good, it just needs to be split to a patch of its own. > } > > state->bus = vep.bus.mipi_csi2; > @@ -749,12 +747,8 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state) > > asd = v4l2_async_nf_add_fwnode_remote(&state->notifier, ep, > struct v4l2_async_connection); > - if (IS_ERR(asd)) { > - ret = PTR_ERR(asd); > - goto err_parse; > - } > - > - fwnode_handle_put(ep); > + if (IS_ERR(asd)) > + return PTR_ERR(asd); > > state->notifier.ops = &imx8mq_mipi_csi_notify_ops; > > @@ -763,11 +757,6 @@ static int imx8mq_mipi_csi_async_register(struct csi_state *state) > return ret; > > return v4l2_async_register_subdev(&state->sd); > - > -err_parse: > - fwnode_handle_put(ep); > - > - return ret; > } > > /* ----------------------------------------------------------------------------- -- Regards, Laurent Pinchart