From patchwork Tue Dec 19 06:44:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 180781 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1752757dyi; Mon, 18 Dec 2023 22:45:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpSABXNul5sfoD3s2ba8FuOFvIdi/MTtb2ds2qIbp8/ur9ESI91FgXwHomInWozDxy4qjS X-Received: by 2002:a05:620a:d88:b0:77f:aea4:64a2 with SMTP id q8-20020a05620a0d8800b0077faea464a2mr8393579qkl.82.1702968300411; Mon, 18 Dec 2023 22:45:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702968300; cv=none; d=google.com; s=arc-20160816; b=pcXhX7ySoeXEngMKSnMJ1SMb8X3qZ3jLW/r2dtiwupiQdyLCCB45MwJglqqNbstRna eVrA1n3jkK0IGyI29AXKs9HVQcsc+N4MjRnL8IgbMyQY8KTdgCZ7s5Ep2UVgEJj3GB8b wcyGbogtO+fCPyH4HvJWJciA7j6iPLxuDz3j+8Wgf3KMe+6e2fg4m89q/LvtmAhEV71j yYaXdxHUAr8OU9Ymf9itpUQ221n+pC3DwCvydywC/3Y/BgvvgidVwjgLGwyvbQt+f1wX Jm23fUlWh0SQqfBCy2OTdwSYhU0XnYSUbO0lnZyc4ZT/HNWoiZWw+shmmUpSLOtV0gA4 uGsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=xrahBIU8mM/3SFJPTd/lOxxCYLakaUUYZ3wIj2rrOwc=; fh=ODv+biDOlWmi/EicMbTRiaSqYH7HTYa7F+drLyQ63Fc=; b=m4Ni55g5PiTtHMX4s+5tuSBYmCgJ46ZAtHz9s0LY1OdQZhx1oZmkKSDaa4v3wKo97v 4f25SRuvAatb49F2lGoxQMvM778nMgkjF8p4T8tT2tEaG7sYpwrFz92ZL/cjP4ZP/ayF 6ba7Yrv3xOEojLW0l+zB8PK3TCHZDkraqW0Ig9lGSWoTIYI/3rdS56JWw+X0zLDLGU3t iWan4cEEI2jChb5YC3ztIyg/Mbz5KayTWIb/XONIyub9tPwbAeThAPVOypCk3ms5/OWh RsIRbpMuAkMQUeIm4cbVJDCjHI/bl4+nrS+DP26slgHMM25w1PzHUma8VZlc95PNQ80R uvdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-4759-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-4759-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id c1-20020a05622a024100b004181bc4d5cfsi5004873qtx.642.2023.12.18.22.45.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 22:45:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-4759-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-4759-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-4759-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 2A28D1C21C19 for ; Tue, 19 Dec 2023 06:45:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8C30C1119A; Tue, 19 Dec 2023 06:44:35 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 9CCB4C12A for ; Tue, 19 Dec 2023 06:44:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rFTq9-0008Bn-5x; Tue, 19 Dec 2023 07:44:29 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rFTq8-00Gs4s-0I; Tue, 19 Dec 2023 07:44:28 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1rFTq7-005oH4-NJ; Tue, 19 Dec 2023 07:44:27 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Arnd Bergmann Cc: kernel@pengutronix.de, Christophe JAILLET , Thierry Reding , linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org Subject: [PATCH 2/2] bus: ts-nbus: Improve error reporting Date: Tue, 19 Dec 2023 07:44:15 +0100 Message-ID: <08f13bf08385784814d7250066b31a735cae3d3d.1702967898.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.42.0 In-Reply-To: <6ae9784dfb98ff63b44735b903e7f4d4e3980222.1702967898.git.u.kleine-koenig@pengutronix.de> References: <6ae9784dfb98ff63b44735b903e7f4d4e3980222.1702967898.git.u.kleine-koenig@pengutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4587; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=e7IKKIepL5PZrMx4Tu9V+DsjoB/iOlb4YfTz/Yi9L8I=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlgTu/+0ae8AfzHvbZ+jZNPQelAi/ZpxF1lPaeb BOlBFewrUOJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZYE7vwAKCRCPgPtYfRL+ Tu0MB/0bJUyYRIGF7ZqmNgg62UNAGhU7B7JuTipYpTFGpwkgzIma1+j6wfs+vN3rVu7ALfL5kJh NwX4RMHpkzb7z5oAA4OFVj41GrwxGH9z1kDgjXNquZnLKGhzdhawkH0aciuP/WwWHiQ+nNKVdCo R7WmRCWhf6URwP/Wzgbs3+zLKntwSZZ8sORdjJnn1fGVCwcCFnB6S/vZlKsHHW8x9Ccx8qRSl/0 pV38kHy0Zz0sRE9uiEJNLAkWp0i1VEypVPgQwmnJZCny7YDX9BkDJ8La0Hq+ZU3yN2cj7TBlG+V eEghNMn7vrXRJW2INU7WpSNaq28lEBpan0UXF4tOyvUBPQdh X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785691688395749770 X-GMAIL-MSGID: 1785691688395749770 Using dev_err_probe() brings several improvements: - emits the symbolic error code - properly handles EPROBE_DEFER - combines error message generation and return value handling While at it add error messages to two error paths that were silent before. Signed-off-by: Uwe Kleine-König --- Changes since (implicit) v1 (https://lore.kernel.org/linux-kernel/20702efe8ab96add9773e97ceed1a6cf91a065ee.1702160838.git.u.kleine-koenig@pengutronix.de): - Fix return value in one error path (Christophe JAILLET) - Rebase to today's next (trivial) drivers/bus/ts-nbus.c | 66 ++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/drivers/bus/ts-nbus.c b/drivers/bus/ts-nbus.c index 19c5d1f4e4d7..baf22a82c47a 100644 --- a/drivers/bus/ts-nbus.c +++ b/drivers/bus/ts-nbus.c @@ -39,45 +39,39 @@ struct ts_nbus { /* * request all gpios required by the bus. */ -static int ts_nbus_init_pdata(struct platform_device *pdev, struct ts_nbus - *ts_nbus) +static int ts_nbus_init_pdata(struct platform_device *pdev, + struct ts_nbus *ts_nbus) { ts_nbus->data = devm_gpiod_get_array(&pdev->dev, "ts,data", GPIOD_OUT_HIGH); - if (IS_ERR(ts_nbus->data)) { - dev_err(&pdev->dev, "failed to retrieve ts,data-gpio from dts\n"); - return PTR_ERR(ts_nbus->data); - } + if (IS_ERR(ts_nbus->data)) + return dev_err_probe(&pdev->dev, PTR_ERR(ts_nbus->data), + "failed to retrieve ts,data-gpio from dts\n"); ts_nbus->csn = devm_gpiod_get(&pdev->dev, "ts,csn", GPIOD_OUT_HIGH); - if (IS_ERR(ts_nbus->csn)) { - dev_err(&pdev->dev, "failed to retrieve ts,csn-gpio from dts\n"); - return PTR_ERR(ts_nbus->csn); - } + if (IS_ERR(ts_nbus->csn)) + return dev_err_probe(&pdev->dev, PTR_ERR(ts_nbus->csn), + "failed to retrieve ts,csn-gpio from dts\n"); ts_nbus->txrx = devm_gpiod_get(&pdev->dev, "ts,txrx", GPIOD_OUT_HIGH); - if (IS_ERR(ts_nbus->txrx)) { - dev_err(&pdev->dev, "failed to retrieve ts,txrx-gpio from dts\n"); - return PTR_ERR(ts_nbus->txrx); - } + if (IS_ERR(ts_nbus->txrx)) + return dev_err_probe(&pdev->dev, PTR_ERR(ts_nbus->txrx), + "failed to retrieve ts,txrx-gpio from dts\n"); ts_nbus->strobe = devm_gpiod_get(&pdev->dev, "ts,strobe", GPIOD_OUT_HIGH); - if (IS_ERR(ts_nbus->strobe)) { - dev_err(&pdev->dev, "failed to retrieve ts,strobe-gpio from dts\n"); - return PTR_ERR(ts_nbus->strobe); - } + if (IS_ERR(ts_nbus->strobe)) + return dev_err_probe(&pdev->dev, PTR_ERR(ts_nbus->strobe), + "failed to retrieve ts,strobe-gpio from dts\n"); ts_nbus->ale = devm_gpiod_get(&pdev->dev, "ts,ale", GPIOD_OUT_HIGH); - if (IS_ERR(ts_nbus->ale)) { - dev_err(&pdev->dev, "failed to retrieve ts,ale-gpio from dts\n"); - return PTR_ERR(ts_nbus->ale); - } + if (IS_ERR(ts_nbus->ale)) + return dev_err_probe(&pdev->dev, PTR_ERR(ts_nbus->ale), + "failed to retrieve ts,ale-gpio from dts\n"); ts_nbus->rdy = devm_gpiod_get(&pdev->dev, "ts,rdy", GPIOD_IN); - if (IS_ERR(ts_nbus->rdy)) { - dev_err(&pdev->dev, "failed to retrieve ts,rdy-gpio from dts\n"); - return PTR_ERR(ts_nbus->rdy); - } + if (IS_ERR(ts_nbus->rdy)) + return dev_err_probe(&pdev->dev, PTR_ERR(ts_nbus->rdy), + "failed to retrieve ts,rdy-gpio from dts\n"); return 0; } @@ -289,25 +283,20 @@ static int ts_nbus_probe(struct platform_device *pdev) return ret; pwm = devm_pwm_get(dev, NULL); - if (IS_ERR(pwm)) { - ret = PTR_ERR(pwm); - if (ret != -EPROBE_DEFER) - dev_err(dev, "unable to request PWM\n"); - return ret; - } + if (IS_ERR(pwm)) + return dev_err_probe(dev, PTR_ERR(pwm), + "unable to request PWM\n"); pwm_init_state(pwm, &state); - if (!state.period) { - dev_err(&pdev->dev, "invalid PWM period\n"); - return -EINVAL; - } + if (!state.period) + return dev_err_probe(dev, -EINVAL, "invalid PWM period\n"); state.duty_cycle = state.period; state.enabled = true; ret = pwm_apply_state(pwm, &state); if (ret < 0) - return ret; + return dev_err_probe(dev, ret, "failed to configure PWM\n"); /* * we can now start the FPGA and populate the peripherals. @@ -321,7 +310,8 @@ static int ts_nbus_probe(struct platform_device *pdev) ret = of_platform_populate(dev->of_node, NULL, NULL, dev); if (ret < 0) - return ret; + return dev_err_probe(dev, ret, + "failed to populate platform devices on bus\n"); dev_info(dev, "initialized\n");