From patchwork Tue Mar 4 17:05:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Draszik?= X-Patchwork-Id: 14001273 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 017C6C282D9 for ; Tue, 4 Mar 2025 18:43:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fIL++x8T3BkXtRTQOtFCJ5vgOIFtA8VKoLyVHxAAukc=; b=XQWD9XYBMVF/vo cZie0ZpESGsSBnwXKIth5Enl8fYR8DXpeKgXg2ivRNmZDa5BCcmCMjM14El/T9RS9vzI9EfCC9DSZ AjycNCORj2DJjs3SniRBdwKLi7Cd3fQDKaNt551aVn50Nq0j9Aq/NSF/QEyZ0y8JaJIROoplslKyW DFYhnepap2zYsrLR7RqwDMCZ0rLyNktAil1Al7iRbdfitC4yAdnisXn6MZIc6/mT/eCCCsUNk5tZt rkCE46BpjocRLusPP3bQgFspiw5wkPunqy2xZhCl/rbJHcQCFOxzYMNYkR/t7R8uIWH8qT+eTpMsV TN8yHdKB+qypFMgLm5zA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpXEu-00000005t6e-3HBG; Tue, 04 Mar 2025 18:43:36 +0000 Received: from mail-ej1-f51.google.com ([209.85.218.51]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpViC-00000005YF6-13vo for linux-amlogic@lists.infradead.org; Tue, 04 Mar 2025 17:05:46 +0000 Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-ab78e6edb99so816702766b.2 for ; Tue, 04 Mar 2025 09:05:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741107942; x=1741712742; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dKiEbfv2wxdcP+dRwBnTiew8ux2INId3e+zLxFho3GE=; b=EE2OgQlutDc7K1zO5JyyjECN8fM57xCEZJHv0GnxImS30+jRC4hO3NAtU829DcU44J y+R99mNtxnWxBf097AayPnq/eGWoerqW2jiwtVEGSjQTxCuGyb1PwBmF5ttp6pha8bOl 3MxD8G6Cg/Lo8tWBdrSOXep62pQfZGSXXR5WBIXPLlmp/NaIA+apjVWqZ5EvCfG4SNLL WmZLHpeSl9cvy0jL7RhXcvfzddOATrvq05Rn4rTjBoAroz1KEzX+gTnc37020lKPYSZy qv0sh+4e4g12uK6HVTCWqmyGElId85xUN2YsfCIxCX6TK9+/tHZze9aY+8KV/GAStFKz 1CjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741107942; x=1741712742; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dKiEbfv2wxdcP+dRwBnTiew8ux2INId3e+zLxFho3GE=; b=lzjZC8lGlqjcz0L7uhz+J5ZtoTJU4tax2JzPw8iY8w3gEfKkXeLQYTf0X65qPxoYt9 g0sGcuHSAbYk+NTuy+9lhs3czgHxKBwx+9zQxp850qfc0qQsIjN3533Ra7Qe1b1Nw/2o Oyero3PgbjQy89DhYucB3VXgVNRsOdk3Jk9c0fOzhu/QAubN657Kx9lZUzTGQRY9qiSf QEb07MDKDXYZsNYAU8RWIbAjcLhAOp7V6qMiXHjYeenJhL6geRbB9hZoAIZefMS5Xs1U Gp2svHthrTKdhiCLrw/5q3h4SZkHDlWwsihK8i9bhFz0Eo5CvFQtiFJYMURTI1NJAzt5 NMoQ== X-Forwarded-Encrypted: i=1; AJvYcCVUTJ4pX8GXvyBQcsiGpHG7n3asEhs0+Z6VKPSWNWhwuqUWetZtH154CJm0pASByisGhkgxJThRHZR34HI/@lists.infradead.org X-Gm-Message-State: AOJu0Yw3KMCAOAS0esCtmK17IQDeTVA6XmCjs/Y5MyTrd4K5pJOCJsUM x6wSWOxOYgz27bDIq8gUDgbavNZ0w58LfF5wDfExfCrrVNsZcbnujtkqBfpoqEg= X-Gm-Gg: ASbGncs6MVnwbbTiWzbJ7iuv1yUcK8aYmpGST6zB0S+ml7MaAMISrJySEt5DSuzxYbi XipjoMLnxvuPsoVaUM3X6mK/ZHFAToQxOCuAJyuipG/eZconPuREgqreFPwD2K/36k08QkzDdd2 VTs18XC1U99bbtOG5wuDUQNPiMEwsm8dklYnCKB0JQgn9wmbuev6UILh5IsRCXupVezXL6CvgBG 0GfqQ9WmHEWAcmWT/UQ/LPho9+WUv6r400brC532ikycDQMyqEbO3KixfucrNulQU0lQ6XHPBT/ PLBbX/qYx96gajIsTKOHOL9SPYz6C9SLxu6aB5KS3ksrnweAOqWDaoay8ca3CdSLDlbf4r5qyx9 GSXNveAXnyaazWsttKrRN0mPKfntG X-Google-Smtp-Source: AGHT+IFbhvINfL30hs3YpvAxvNGhpuF08a7SPp+ErND7dZCCpi05AobDmHrT2jaUznfQQ+NeOSHQXw== X-Received: by 2002:a17:907:2d0d:b0:abf:777d:fb7a with SMTP id a640c23a62f3a-ac20da97c7dmr2947466b.46.1741107942351; Tue, 04 Mar 2025 09:05:42 -0800 (PST) Received: from puffmais.c.googlers.com (30.171.91.34.bc.googleusercontent.com. [34.91.171.30]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abf795ba15esm367589066b.131.2025.03.04.09.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 09:05:41 -0800 (PST) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Tue, 04 Mar 2025 17:05:44 +0000 Subject: [PATCH v2 16/16] rtc: s5m: convert to dev_err_probe() where appropriate MIME-Version: 1.0 Message-Id: <20250304-rtc-cleanups-v2-16-d4689a71668c@linaro.org> References: <20250304-rtc-cleanups-v2-0-d4689a71668c@linaro.org> In-Reply-To: <20250304-rtc-cleanups-v2-0-d4689a71668c@linaro.org> To: Chanwoo Choi , Krzysztof Kozlowski , Alexandre Belloni , Joel Stanley , Andrew Jeffery , Hans Ulli Kroll , Linus Walleij , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , =?utf-8?b?VMOz?= =?utf-8?b?dGggSsOhbm9z?= , Dianlong Li , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt Cc: linux-kernel@vger.kernel.org, linux-rtc@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-amlogic@lists.infradead.org, llvm@lists.linux.dev, =?utf-8?q?Andr=C3=A9_Draszik?= , Krzysztof Kozlowski X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250304_090544_294623_6DFD2C30 X-CRM114-Status: GOOD ( 13.72 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org dev_err_probe() exists to simplify code and harmonise error messages, there's no reason not to use it here. Reviewed-by: Krzysztof Kozlowski Signed-off-by: André Draszik --- drivers/rtc/rtc-s5m.c | 50 +++++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c index 88aed27660348a05886f080a2848fcabbf9666d0..db5c9b641277213aa1371776c63e2eda3f223465 100644 --- a/drivers/rtc/rtc-s5m.c +++ b/drivers/rtc/rtc-s5m.c @@ -626,11 +626,10 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *info) } info->rtc_24hr_mode = 1; - if (ret < 0) { - dev_err(info->dev, "%s: fail to write controlm reg(%d)\n", - __func__, ret); - return ret; - } + if (ret < 0) + return dev_err_probe(info->dev, ret, + "%s: fail to write controlm reg\n", + __func__); return ret; } @@ -669,26 +668,21 @@ static int s5m_rtc_probe(struct platform_device *pdev) alarm_irq = S5M8767_IRQ_RTCA1; break; default: - dev_err(&pdev->dev, - "Device type %lu is not supported by RTC driver\n", - platform_get_device_id(pdev)->driver_data); - return -ENODEV; + return dev_err_probe(&pdev->dev, -ENODEV, + "Device type %lu is not supported by RTC driver\n", + platform_get_device_id(pdev)->driver_data); } i2c = devm_i2c_new_dummy_device(&pdev->dev, s5m87xx->i2c->adapter, RTC_I2C_ADDR); - if (IS_ERR(i2c)) { - dev_err(&pdev->dev, "Failed to allocate I2C for RTC\n"); - return PTR_ERR(i2c); - } + if (IS_ERR(i2c)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2c), + "Failed to allocate I2C for RTC\n"); info->regmap = devm_regmap_init_i2c(i2c, regmap_cfg); - if (IS_ERR(info->regmap)) { - ret = PTR_ERR(info->regmap); - dev_err(&pdev->dev, "Failed to allocate RTC register map: %d\n", - ret); - return ret; - } + if (IS_ERR(info->regmap)) + return dev_err_probe(&pdev->dev, PTR_ERR(info->regmap), + "Failed to allocate RTC register map\n"); info->dev = &pdev->dev; info->s5m87xx = s5m87xx; @@ -696,11 +690,10 @@ static int s5m_rtc_probe(struct platform_device *pdev) if (s5m87xx->irq_data) { info->irq = regmap_irq_get_virq(s5m87xx->irq_data, alarm_irq); - if (info->irq <= 0) { - dev_err(&pdev->dev, "Failed to get virtual IRQ %d\n", - alarm_irq); - return -EINVAL; - } + if (info->irq <= 0) + return dev_err_probe(&pdev->dev, -EINVAL, + "Failed to get virtual IRQ %d\n", + alarm_irq); } platform_set_drvdata(pdev, info); @@ -724,11 +717,10 @@ static int s5m_rtc_probe(struct platform_device *pdev) ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL, s5m_rtc_alarm_irq, 0, "rtc-alarm0", info); - if (ret < 0) { - dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n", - info->irq, ret); - return ret; - } + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, + "Failed to request alarm IRQ %d\n", + info->irq); device_init_wakeup(&pdev->dev, true); }