From patchwork Tue Apr 18 08:00:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ceresoli X-Patchwork-Id: 13215179 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 68FF6C77B78 for ; Tue, 18 Apr 2023 08:01:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6CD6E10E6D7; Tue, 18 Apr 2023 08:01:29 +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 9B39E10E6D7 for ; Tue, 18 Apr 2023 08:01:27 +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 CABDF240009; Tue, 18 Apr 2023 08:01:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1681804886; 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=h4hLigvdbOVO3P4ObAFFWRZdoPUgyggKpMDr+PVSErU=; b=ej0CFkiYcDlbNTe95lM4ZQRGtji1xCD/12axQgLoDUa2qIc82WGBOukcHlE/3ZY8oBXrMh ObGlJCM9Brxe2PHwcWvobDsxHSnqDX59DJqncnSrFqRpmybNbWHnRT82EaGKRXAF+n89P7 CDI+wklPwZXQbgzUqEGXXw4Wm3FP/Yv3y+NCxwtdN+XyLMPMm0+gT/UAwDhS6U/flobopr V339JsO2QSz9F63yt5MlwuIiTfGJwo8riWz3c0vFGa9hFnUS+cnzt04umaPEKOGKnrOCFT ykX3UJmAxbcVl+1mxB37LvrwBDncjM7vglk0aj+nvr+mNAVlzKVNOseAEEnS9g== From: Luca Ceresoli To: linux-tegra@vger.kernel.org Subject: [PATCH v6 06/20] staging: media: tegra-video: improve error messages Date: Tue, 18 Apr 2023 10:00:40 +0200 Message-Id: <20230418080054.452955-7-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" tegra_vi_channels_alloc() can primarily fail for two reasons: 1. "ports" node not found 2. port_num > vi->soc->vi_max_channels Case 1 prints nothing, case 2 has a dev_err(). The caller [tegra_vi_init()] has a generic dev_err() on any failure. This mean that in case 2 we print two messages, and in case 1 we only print a generic message. Remove the generic message and add a specific message when case 1 happens, so that we always have one specific message without even increasing the number of dev_dbg*() calls. 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 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c index 79dd02a1e29b..1c0424bf1ab0 100644 --- a/drivers/staging/media/tegra-video/vi.c +++ b/drivers/staging/media/tegra-video/vi.c @@ -1361,7 +1361,7 @@ static int tegra_vi_channels_alloc(struct tegra_vi *vi) ports = of_get_child_by_name(node, "ports"); if (!ports) - return -ENODEV; + return dev_err_probe(vi->dev, -ENODEV, "%pOF: missing 'ports' node\n", node); for_each_child_of_node(ports, port) { if (!of_node_name_eq(port, "port")) @@ -1921,11 +1921,8 @@ static int tegra_vi_init(struct host1x_client *client) ret = tegra_vi_tpg_channels_alloc(vi); else ret = tegra_vi_channels_alloc(vi); - if (ret < 0) { - dev_err(vi->dev, - "failed to allocate vi channels: %d\n", ret); + if (ret < 0) goto free_chans; - } ret = tegra_vi_channels_init(vi); if (ret < 0)