From patchwork Sat Dec 9 22:35:08 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: 176252 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6265543vqy; Sat, 9 Dec 2023 14:36:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IEFAPYlG8Akk0jH4Kk26Csb6W38lmYZVNJ+LxtbR+xHVnU579LyRVYjc8Nz1PlzKmqW5olx X-Received: by 2002:a05:6a20:bf10:b0:18f:97c:617a with SMTP id gc16-20020a056a20bf1000b0018f097c617amr2743354pzb.119.1702161361733; Sat, 09 Dec 2023 14:36:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702161361; cv=none; d=google.com; s=arc-20160816; b=BbgZ8HYJG42PDbJL096zziGNxiq0TkABnIqF2Qax7OUA5gEUH9Sx3QPX93tywvtHgb vLGrhhMcJKl51gO3EYw6oH3o9iH2XLv04G8sLzQoeok7Luj1qEVGtKfFtOEbwxVW2uBn UtFZtZoL9of017Qo+jH6GHp138lzhg7IG6wYIE9t0vBox+Eu7k6brd7Cy8tiZGk8cmBV yVRid9Y3DyOLg9eNf0/dK5rfX4IirJi/lxMzVemun6RvLCsMLSmRVcsZu5DxP5YV7f+0 8yzdJZdB6YzPVaIt58wYJXR5e/r/ZeF7I32w5YXHlkYIbDvWdZC82U+PZoIda9CF43LT OkZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=xopI4y5LKtuqd5SMoOHYAgP87YW+SY4bf9pwU2KDiLg=; fh=REsz6PbT4MGjSsfCzluXCEWV1pMhCNQQpBy4mvsOyiA=; b=UEWiEvJRMbwoA+h1or+KHH3GUGP/mhQ3Qc7zsw/F3qODNoNHMspCxfWhzQxBf5NJaF GtHCCFpvLHzGY74g7PFus1Bex4/t8YNh0ZQl8BRKdZtnsy2mU0puZQ5rE5Qd3w7ij1F3 d+3twwvS+zLCAm9Eo1rCQo07mWWsP87+JI2vr8xKX/AXjFv/2XJnKt8sWsysSA5vscNr hEiZWh5Yl3GpuqM6ZqW5/X4NfvGH7VxQDHw9q8iockiWeMjSDmN5MFPpoFRjkZiIbFRl omlryvn5M0lDxKSL4zPiEqAN3rhlSAy6qU+rGdTbq5STfJbKCagejHUrb4LX59dOwxqb VnKw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id a1-20020a654181000000b005c6deead022si3534216pgq.603.2023.12.09.14.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 14:36:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 779238082932; Sat, 9 Dec 2023 14:35:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231396AbjLIWfd (ORCPT + 99 others); Sat, 9 Dec 2023 17:35:33 -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_Kleine-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 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 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-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sat, 09 Dec 2023 14:35:59 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784845552139596061 X-GMAIL-MSGID: 1784845552139596061 With this change the PWM hardware is only configured once (instead of three times. Signed-off-by: Uwe Kleine-König --- 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 = &pdev->dev; struct ts_nbus *ts_nbus; int ret; @@ -296,25 +296,22 @@ static int ts_nbus_probe(struct platform_device *pdev) return ret; } - 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; } - /* - * FIXME: pwm_apply_args() should be removed when switching to - * the atomic PWM API. - */ - pwm_apply_args(pwm); - ret = pwm_config(pwm, pargs.period, pargs.period); + state.duty_cycle = state.period; + state.enabled = true; + + ret = pwm_apply_state(pwm, &state); if (ret < 0) return ret; /* * we can now start the FPGA and populate the peripherals. */ - pwm_enable(pwm); ts_nbus->pwm = pwm; /* From patchwork Sat Dec 9 22:35:09 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: 176251 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6265466vqy; Sat, 9 Dec 2023 14:35:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGOJeS8BhTMrktlQUR8Vp5PyLX3mq/oyu8x2VNTDP+WL2JUTstbsZe+nbCPGrg/BJAwa1Hx X-Received: by 2002:a05:6808:38c5:b0:3b9:dd4e:d87b with SMTP id el5-20020a05680838c500b003b9dd4ed87bmr3061748oib.65.1702161341115; Sat, 09 Dec 2023 14:35:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702161341; cv=none; d=google.com; s=arc-20160816; b=JdE39pO59oVN4gZye/bokPeqdGEHj0rGj0chXphYJSXEUkd0wpsOiETyJzLWBZLkqA 1+inoKRTwvXWi3YzJokph2c+QHWhokmMTIQ+qaYK5toQzRef4EcULpZTd+RrddLAyBLt Ul2CJEmFyXCm55l5ThHb+2eAdjW8YQREqvlK/ag3gWWnyVOms/aAsImX4OOUeC40SALQ 6axz23yX5/v3DfgihrRBD+AhuXHy7uCDTJTBtFiROdwzJM5aw8LgOzVDkGJ4PnYIRfoV oPs0yL3cbSQlJHKGlw1sWznPJdF2OR7bix62rYw36FL2p0OE7GhLqB4LhZvGPVNJWksb OaWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=NfehPR0SM4PYU7hlaee6tDMjUI6V5tTRAO7wyKR0Z/Y=; fh=F9fQixgpx8g2HYmZejR9vffbugmtMvVSliH8+jArpv4=; b=Pl2iw7D6EAoA4vHznVnYMX7etlRY8TzPv22a66AsJJKx6+oLhGDBd9N9H+cR6Q9nCk BKx/vflww/86LvkT9KYWfmCysmoNH48r5tmnGyVV3uGKKtnwRPXlnQzK/nzPavzUHhkO gxuE1uojO94i6ZSuOO8L/LKexdWFgL7eOUvPFvbM0Mf6Irl76WXMX04+DTfAoEVxA/9Q TcZmwO+X7q0Z3GP4l6yavoeAcXt5kmyUTKICIxEExMearnHIY38C2UNOAHhMXLab5wsy 3xCtEbP1O8xS4VBZjyaYAPqb4TcdFFnKPIh8EYM/0GkkwyS7WeLLMYhjB3jiH/lKWSwN AqUg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id dw7-20020a056a00368700b006ce060dba6esi3667142pfb.240.2023.12.09.14.35.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 14:35:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 9F86A8065024; Sat, 9 Dec 2023 14:35:38 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231298AbjLIWf1 (ORCPT + 99 others); Sat, 9 Dec 2023 17:35:27 -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_Kleine-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 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 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-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sat, 09 Dec 2023 14:35:38 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784845530444927866 X-GMAIL-MSGID: 1784845530444927866 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 --- 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 = 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,19 @@ 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, ret, "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 +309,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");