From nobody Tue Dec 16 16:35:17 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3074C4167B for ; Sat, 9 Dec 2023 22:35:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231406AbjLIWff (ORCPT ); Sat, 9 Dec 2023 17:35:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231356AbjLIWf2 (ORCPT ); Sat, 9 Dec 2023 17:35:28 -0500 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC4AE10B for ; Sat, 9 Dec 2023 14:35:34 -0800 (PST) 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 1rC5uw-00032N-Ox; Sat, 09 Dec 2023 23:35:26 +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 1rC5uw-00EjdL-0E; Sat, 09 Dec 2023 23:35:26 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1rC5uv-00HPIS-NE; Sat, 09 Dec 2023 23:35:25 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Sebastien Bourdelin , Arnd Bergmann Cc: linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 1/2] bus: ts-nbus: Convert to atomic pwm API Date: Sat, 9 Dec 2023 23:35:08 +0100 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1440; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=NUJ1Gt6VwGMftKvVqxYgxzXSxQDiBB4zUBEKnts2wfE=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBldOuh5BIaA5FJtvLH/lJXrJ/5Lo1Ru8696ozS1 uDV9Fu4XxmJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZXTroQAKCRCPgPtYfRL+ TvN/B/9PVKXEOogbv4Dji0ItazpVzG1TDX860dC8abRXAuPfby0Y6TAUwzJlfiXfBVmADU8t7Ds CDhEcgrxm8UlVwFMugLmIH3Sf5QZu8vflDtV5SHBJsofWO4t9mEBPMDkddf+hudqL6UEJH9Zd1P h1zeTP5fghvDDtcWyRVhFFt1qXFyLTB64ufI9yd8fp1qf7EiA0oAP7VbfWvl2us8YGUWWlw5UQg 68q15YURS0Z2yfOUw+/zkqsuIpUy0KzR4w23ClTRl7JpCR820gE7dBydgruMemvnWJt0QJLeMp3 SBWklQdJw0c1AOZJeowQRoJcOluYvlHxUwSSQHt3yEJ7ycsw X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With this change the PWM hardware is only configured once (instead of three times. Signed-off-by: Uwe Kleine-K=C3=B6nig --- drivers/bus/ts-nbus.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/bus/ts-nbus.c b/drivers/bus/ts-nbus.c index 4fa932cb0915..19c5d1f4e4d7 100644 --- a/drivers/bus/ts-nbus.c +++ b/drivers/bus/ts-nbus.c @@ -273,7 +273,7 @@ EXPORT_SYMBOL_GPL(ts_nbus_write); static int ts_nbus_probe(struct platform_device *pdev) { struct pwm_device *pwm; - struct pwm_args pargs; + struct pwm_state state; struct device *dev =3D &pdev->dev; struct ts_nbus *ts_nbus; int ret; @@ -296,25 +296,22 @@ static int ts_nbus_probe(struct platform_device *pdev) return ret; } =20 - pwm_get_args(pwm, &pargs); - if (!pargs.period) { + pwm_init_state(pwm, &state); + if (!state.period) { dev_err(&pdev->dev, "invalid PWM period\n"); return -EINVAL; } =20 - /* - * FIXME: pwm_apply_args() should be removed when switching to - * the atomic PWM API. - */ - pwm_apply_args(pwm); - ret =3D pwm_config(pwm, pargs.period, pargs.period); + state.duty_cycle =3D state.period; + state.enabled =3D true; + + ret =3D pwm_apply_state(pwm, &state); if (ret < 0) return ret; =20 /* * we can now start the FPGA and populate the peripherals. */ - pwm_enable(pwm); ts_nbus->pwm =3D pwm; =20 /* --=20 2.42.0 From nobody Tue Dec 16 16:35:17 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53D67C4167B for ; Sat, 9 Dec 2023 22:35:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231360AbjLIWf2 (ORCPT ); Sat, 9 Dec 2023 17:35:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229477AbjLIWf0 (ORCPT ); Sat, 9 Dec 2023 17:35:26 -0500 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CE5410C7 for ; Sat, 9 Dec 2023 14:35:31 -0800 (PST) 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 1rC5uw-00032j-Ox; Sat, 09 Dec 2023 23:35:26 +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 1rC5uw-00EjdO-6I; Sat, 09 Dec 2023 23:35:26 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1rC5uv-00HPIV-TP; Sat, 09 Dec 2023 23:35:25 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Sebastien Bourdelin , Arnd Bergmann Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 2/2] bus: ts-nbus: Improve error reporting Date: Sat, 9 Dec 2023 23:35:09 +0100 Message-ID: <20702efe8ab96add9773e97ceed1a6cf91a065ee.1702160838.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=4311; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=8lzqMiv8dr6oNnog2haq92zmbN0yI9Y65SNt9GRuK+U=; b=owGbwMvMwMXY3/A7olbonx/jabUkhtSS18tP5CTKCZYfm9VTU9H/nH3B4b7yWrabh5ubU4Tst vxbwdzVyWjMwsDIxSArpshi37gm06pKLrJz7b/LMINYmUCmMHBxCsBErp1m/6f37b84p5vl9Ofm 8+f6yiWxGRU168THrJyYLi5155OC+dfIa4sqrI2Ln35+rLko7dPDfzcnsUmEeC3SrfJsuCe7TzV UQqXW9kv+u//ilgz7fQVCk5R43p6P0vzKsOwkz7vUHd+E285P05yzYLaeKuNNSfastZfjO23OCy h3Komn525nN1QSy7lyi+lw+ny1m6oXbvYk9wT+EJ2rXC9RejH87coV9mbPPCyeN7GpWSyo5RLvc tihK/1ykupdqw0O2ZHVrus+ck1v8JHU/DPp8YYDryt3svdKtv19Z2v+b3pMwZroSsfQt1L1Hmt9 FlZ7S2T8vRnyonxu944Gvv5HyYyBGyvb9z6ZJTPNeMsbAA== X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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=C3=B6nig --- drivers/bus/ts-nbus.c | 65 ++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/drivers/bus/ts-nbus.c b/drivers/bus/ts-nbus.c index 19c5d1f4e4d7..89c6ce1403e3 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 =3D 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"); =20 ts_nbus->csn =3D 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"); =20 ts_nbus->txrx =3D 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"); =20 ts_nbus->strobe =3D devm_gpiod_get(&pdev->dev, "ts,strobe", GPIOD_OUT_HIG= H); - 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"); =20 ts_nbus->ale =3D 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"); =20 ts_nbus->rdy =3D 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"); =20 return 0; } @@ -289,25 +283,19 @@ static int ts_nbus_probe(struct platform_device *pdev) return ret; =20 pwm =3D devm_pwm_get(dev, NULL); - if (IS_ERR(pwm)) { - ret =3D PTR_ERR(pwm); - if (ret !=3D -EPROBE_DEFER) - dev_err(dev, "unable to request PWM\n"); - return ret; - } + if (IS_ERR(pwm)) + return dev_err_probe(dev, ret, "unable to request PWM\n"); =20 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"); =20 state.duty_cycle =3D state.period; state.enabled =3D true; =20 ret =3D pwm_apply_state(pwm, &state); if (ret < 0) - return ret; + return dev_err_probe(dev, ret, "failed to configure PWM\n"); =20 /* * we can now start the FPGA and populate the peripherals. @@ -321,7 +309,8 @@ static int ts_nbus_probe(struct platform_device *pdev) =20 ret =3D 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"); =20 dev_info(dev, "initialized\n"); =20 --=20 2.42.0