From patchwork Sun Jan 29 12:04:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 49963 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1719238wrn; Sun, 29 Jan 2023 04:12:03 -0800 (PST) X-Google-Smtp-Source: AK7set8TrP0nwsf+6WOCd4zincjI4xI2EyZYiTBiOZ0MPLNRpwAK98SHgqcDmcjYziaQZlIb3Hre X-Received: by 2002:a17:906:6db:b0:87b:d597:1fd5 with SMTP id v27-20020a17090606db00b0087bd5971fd5mr9930619ejb.75.1674994323374; Sun, 29 Jan 2023 04:12:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674994323; cv=none; d=google.com; s=arc-20160816; b=f9SYJ3HVNIEXQp5tn4VGMzZTnB7DZS66Xw1KuCbrp1H8sEoiVcrgLqec2NqnGa9F1Z Kt5kFX39P/T0eOu+lG41zEK1IEF0YZgY/tIHurGmzSgQ/ksx42eHwQHwj8YbWXvmSe/W qh1TMwIbLg9JPgFF0fJIxh+KoYZ78sUpX9FMcLThcRkB7/2JgO1tV574bfSWtVENFaSC 4kf9MmB/9tMJGuCs/1DqU7cx9PNydh/zbcJzcS22hM5FfzCWQQ6IQ5FRyZ02C+sQItXJ JVudrsO2MV08YPJUjzvJpM0uH6t2Pyb0VHb6oXe5s5UWcXs8CM0+ZvYkqGX+C7zfInHT Eksg== 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 :dkim-signature; bh=y1IJEsvKeYpQS+dvslB9I/8U3h0z6+5xQ1oLdzzjDbQ=; b=T1MIIztMSJUxDMnhbhRY5/pB2Nxwlt3ZZKvIsGsririfxakcCFRMC9fSu3/gU8S2Nl ln5gFLOFrq/mfYOM1gqGn/c04aM+gv5B+C+HopR0fWIekm1v0Pbp1Mr0nx81nMKakNgH pq0Lz3td3CGuxxOjLfpsH3a3/oI/83AThtp+XlA5+GlHC6Frt6viyMfBoAEPDuLG3J4p YP/LAG5O1CaCwh047iJVfT8B3n+ymkjXUdIPg3rr5E7AWP/scbrKveuxwuDCKrJXadik SXE2asuW7h9PFRpjIcvNFyG3RQjnMByqE0acaxefhXc/KcN3Evd2BL/PJ3FjmGimw8rU qOog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=W0tsFp8D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id up26-20020a170907cc9a00b0087091d24e3csi10527966ejc.88.2023.01.29.04.11.40; Sun, 29 Jan 2023 04:12:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=W0tsFp8D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234878AbjA2MFh (ORCPT + 99 others); Sun, 29 Jan 2023 07:05:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232009AbjA2MFe (ORCPT ); Sun, 29 Jan 2023 07:05:34 -0500 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F71B2387A; Sun, 29 Jan 2023 04:05:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1674993892; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y1IJEsvKeYpQS+dvslB9I/8U3h0z6+5xQ1oLdzzjDbQ=; b=W0tsFp8DSSdHO+HZYZOczWMTpPIP7pMkBmkmO4HCPDaKx6UGLn1X2MyK5lj3Sd4F6bS32f tMnQJShDR9Ed6rW7t83VL6LKJn9aYfwiOmjO8OfSnCOlbVqERIo+TwNnqZNMw4JpFEiUSc wHJMmggog9HXeXAvGzo/AxsUYBGvwC8= From: Paul Cercueil To: Alessandro Zummo , Alexandre Belloni , Rob Herring , Krzysztof Kozlowski Cc: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, list@opendingux.net, Paul Cercueil Subject: [PATCH v3 3/4] rtc: jz4740: Use dev_err_probe() Date: Sun, 29 Jan 2023 12:04:41 +0000 Message-Id: <20230129120442.22858-4-paul@crapouillou.net> In-Reply-To: <20230129120442.22858-1-paul@crapouillou.net> References: <20230129120442.22858-1-paul@crapouillou.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756358847691782821?= X-GMAIL-MSGID: =?utf-8?q?1756358847691782821?= Use dev_err_probe() where it makes sense to simplify a bit the code. Signed-off-by: Paul Cercueil --- drivers/rtc/rtc-jz4740.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/rtc/rtc-jz4740.c b/drivers/rtc/rtc-jz4740.c index 4ee6e5ee09b1..9ffa764aa71e 100644 --- a/drivers/rtc/rtc-jz4740.c +++ b/drivers/rtc/rtc-jz4740.c @@ -329,17 +329,13 @@ static int jz4740_rtc_probe(struct platform_device *pdev) device_init_wakeup(dev, 1); ret = dev_pm_set_wake_irq(dev, irq); - if (ret) { - dev_err(dev, "Failed to set wake irq: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to set wake irq\n"); rtc->rtc = devm_rtc_allocate_device(dev); - if (IS_ERR(rtc->rtc)) { - ret = PTR_ERR(rtc->rtc); - dev_err(dev, "Failed to allocate rtc device: %d\n", ret); - return ret; - } + if (IS_ERR(rtc->rtc)) + return dev_err_probe(dev, PTR_ERR(rtc->rtc), + "Failed to allocate rtc device\n"); rtc->rtc->ops = &jz4740_rtc_ops; rtc->rtc->range_max = U32_MAX; @@ -356,10 +352,8 @@ static int jz4740_rtc_probe(struct platform_device *pdev) ret = devm_request_irq(dev, irq, jz4740_rtc_irq, 0, pdev->name, rtc); - if (ret) { - dev_err(dev, "Failed to request rtc irq: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Failed to request rtc irq\n"); if (of_device_is_system_power_controller(np)) { dev_for_power_off = dev;