From patchwork Tue Apr 18 08:00:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ceresoli X-Patchwork-Id: 13215181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0AC3C77B76 for ; Tue, 18 Apr 2023 08:01:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 009D510E6DD; Tue, 18 Apr 2023 08:01:34 +0000 (UTC) Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [IPv6:2001:4b98:dc4:8::230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9232710E6D8 for ; Tue, 18 Apr 2023 08:01:31 +0000 (UTC) Received: from booty.fritz.box (unknown [77.244.183.192]) (Authenticated sender: luca.ceresoli@bootlin.com) by mail.gandi.net (Postfix) with ESMTPA id 84CE824000B; Tue, 18 Apr 2023 08:01:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1681804890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p+VzAfaSqgxKGJT/6W+d7FGRqtXq2O0GiseDQOgCfqU=; b=CGSJMVEfNn8zDkV84d82TAiUJl2y5+Pwo1O9aV9Ce6AJUmPS1EFtWXRwjBkjvUpbugSmJF gWNi3LaMjt3p0GQ1boGQjjxiRUhwx0e1IVVbR7U82AwdGKH9DRehcs9Qf0Q5uvaPNNYp53 LBwqkFoviljVP5xY31IOwLko5O0Y2bEwke3syBsV21u6A75adHeimqpA7r0Y3at6Kj2tRU rxMP8LdJ3mFOz6Ll0PnuOdpJaaZ3sMNKH/bFqvduwga4so63TVUXUK9xPChmKRrjYecbBt w5mwIpP+OXS7y1YT0hCEpk6JM31QPYZPS/HVg/RcmtRji64IiXrR/r3EfatQHg== From: Luca Ceresoli To: linux-tegra@vger.kernel.org Subject: [PATCH v6 07/20] staging: media: tegra-video: slightly simplify cleanup on errors Date: Tue, 18 Apr 2023 10:00:41 +0200 Message-Id: <20230418080054.452955-8-luca.ceresoli@bootlin.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230418080054.452955-1-luca.ceresoli@bootlin.com> References: <20230418080054.452955-1-luca.ceresoli@bootlin.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Laurent Pinchart , Krzysztof Kozlowski , Richard Leitner , Thomas Petazzoni , Luca Ceresoli , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Rob Herring , Jonathan Hunter , Paul Kocialkowski , Thierry Reding , Sowjanya Komatineni , dri-devel@lists.freedesktop.org, Greg Kroah-Hartman , Hans Verkuil , Dmitry Osipenko , Mauro Carvalho Chehab , linux-media@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" of_node_put(node) does nothing if node == NULL, so it can be moved to the cleanup section at the bottom. Signed-off-by: Luca Ceresoli Reviewed-by: Dmitry Osipenko --- No changes in v6 No changes in v5 Changed in v4: - Added review tags No changes in v3 No changes in v2 --- drivers/staging/media/tegra-video/vi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c index 1c0424bf1ab0..ce4ff4cbf587 100644 --- a/drivers/staging/media/tegra-video/vi.c +++ b/drivers/staging/media/tegra-video/vi.c @@ -1352,7 +1352,7 @@ static int tegra_vi_channels_alloc(struct tegra_vi *vi) struct device_node *node = vi->dev->of_node; struct device_node *ep = NULL; struct device_node *ports; - struct device_node *port; + struct device_node *port = NULL; unsigned int port_num; struct device_node *parent; struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type = 0 }; @@ -1375,7 +1375,6 @@ static int tegra_vi_channels_alloc(struct tegra_vi *vi) dev_err(vi->dev, "invalid port num %d for %pOF\n", port_num, port); ret = -EINVAL; - of_node_put(port); goto cleanup; } @@ -1398,13 +1397,12 @@ static int tegra_vi_channels_alloc(struct tegra_vi *vi) lanes = v4l2_ep.bus.mipi_csi2.num_data_lanes; ret = tegra_vi_channel_alloc(vi, port_num, port, lanes); - if (ret < 0) { - of_node_put(port); + if (ret < 0) goto cleanup; - } } cleanup: + of_node_put(port); of_node_put(ports); return ret; }