From patchwork Fri Feb 28 14:07:31 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: 13996520 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 CD74FC282C1 for ; Fri, 28 Feb 2025 14:34:42 +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=OLIJqLZw5Ov8NVcIuXN/A4NqJfqK1+Qtfb4NRTQ1R2w=; b=mJHxPF8n7L98tf TryqL91e2ALN9X224HLiwrsJtdMHHm8y+R+RfUDWd56DJ7eddFbSVjSYsOd+NRLbKdvp36pSKtCFM N3sxk1djkvQrbcrbHQSnSuG3Us/KJQeN+gQMVC0Y8CCdHReQofm5ZYuYZn8WRSAL6o+RIv/npGFHo Y7/K9Cik7+Cx4I3zeBMIUeaqn323Re2VRXSrgcuIHNWGp1Ek8tLC81Etp5UEao5FTbHnat132UL+6 jbD9rncGC02CVI2WYzS5y5yy579eB7cyhsR+A0QSMqhbNDnj/dtWC5InfTwjQSj9D6QRLGZYoHuBH vlTD0PlzNzrBkufpc5dA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1to1Rn-0000000BHhf-48p5; Fri, 28 Feb 2025 14:34:39 +0000 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1to11Z-0000000BBEF-3N6J for linux-amlogic@lists.infradead.org; Fri, 28 Feb 2025 14:07:34 +0000 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5e0573a84fcso3088457a12.2 for ; Fri, 28 Feb 2025 06:07:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740751652; x=1741356452; 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=ucCmymGJlfsI4F5PNnMG7qiqKtfzqtFmwv0m9GhXqKs=; b=oU+GIRwMvYl1Jj98PGNUWsIeEfT8gDu1c/ELNwP1z82DC8+yZcKG9KhP82pTWOVAC9 lFKAtNpvoCNFGsHOJ8xYglTbY43BIeQqxfp1TxWB1ixtEdkb6fBViI6Ugc6izyNM5+C5 skvp27d/cPeCvReeCC7lLU3Jb52GfiBq3Uow0ldLy7zMpVMGW3Jq1QyisB7DaAOHkDCI Xzo5i8RnIGEbnOgeBJAyLsgdHtHujBpY4Z18RVBZ3/hlmSXUcUtNMKwQq0WXtiXeX/yR MtjvedvfxB54utRnzAxp3IcSuAjY4hrug9hrGRE8/OuHxh0w2Wr1WxiLxkonOkCL9Sm1 hwDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740751652; x=1741356452; 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=ucCmymGJlfsI4F5PNnMG7qiqKtfzqtFmwv0m9GhXqKs=; b=HN7RZsn+AX5wPBbULdxgq/nQiXCgBewX0muKwX+vjR8DgkwV/cPcfVCtW3Htt60Kzv egnCyy+tsQQAS4WOH+GTl0ADr6bPKSooEjiZEEVv8PqVnIP0pjEirKs5enSGJ0OwUhdH bcn728lS6WoWwglap7rc5AM+FzoKWzDVCfx6pfJWQFPdKhosAAkpCripXtEneUioLiBj PudmgLnxJ6JH0Y+S4AwAXGMAAPTFkB1fsciew9D/dg9eQNijln9hnxMJKBfFJ/3LtxYx BGy9Z9faJYaYiZCdI5nf8v8Vg960ekDy2sRpBABgJA8rZDDZNTXu7bkGQzDQYeTaNqmZ DfRQ== X-Forwarded-Encrypted: i=1; AJvYcCW+2NJhHMMPnQYRhYYq9xWzj4M3WkVmacf0O8ch/osOBM1reF9XzZOTT7C2BxuHTtcvKtGJepQlqyCFOEaD@lists.infradead.org X-Gm-Message-State: AOJu0YyEVy845KhnIVI51Js0u96w/cLZN5R4yX41apt2S88QA+RVkkxt 6XWpmw+hkhDJJswBi3DTrisuH2bQdKYdIKgPsYLqNSgKVGQTPVbUD3qUnJUBJmA= X-Gm-Gg: ASbGncsfyua3qhpePlVa+u4bbP0zzW46IqlYD5NFfD8dFYNwL3gucJErixiKUrDO3ZS 9/VzfS41krRcrYTVg18ubJslsDknZ62faYCeRkuB9JE/lA/cUuCmL8edsvuOvmh/nIT3tgXha6Q L8o6AjRCQwWCfJiWhLTd8FD5jv1Ljo0Ua95WG1GVAzLRAwjzmxySZe0w7zAynzcPO7DwRU7QP/t MVf6nPFebugbPN07702jEapPGOzs7Inmeky316cqf0D8BeO8pe+iQbDWnVGgBR2xqDSXwyynBoL MhobpEdDcGipgVVN1OGQdYkXb7KN7c1lR09TqdqK3yVSphKSsiyNCQdeYaBEhOkSe0W/oHAZqkN Bjgg8z/e7uw== X-Google-Smtp-Source: AGHT+IHUtKBxx/Kb6wMivayuykLjA27f1K+WzySysSQHyW8EvpaAIClZC0PRyUOpjP+2MS95jX29jw== X-Received: by 2002:a05:6402:35cd:b0:5db:f5bc:f696 with SMTP id 4fb4d7f45d1cf-5e4d6ad3e14mr2592499a12.5.1740751652457; Fri, 28 Feb 2025 06:07:32 -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 4fb4d7f45d1cf-5e4c3fb51f9sm2550839a12.55.2025.02.28.06.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 06:07:32 -0800 (PST) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Fri, 28 Feb 2025 14:07:31 +0000 Subject: [PATCH 18/18] rtc: s5m: convert to dev_err_probe() where appropriate MIME-Version: 1.0 Message-Id: <20250228-rtc-cleanups-v1-18-b44cec078481@linaro.org> References: <20250228-rtc-cleanups-v1-0-b44cec078481@linaro.org> In-Reply-To: <20250228-rtc-cleanups-v1-0-b44cec078481@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 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, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250228_060733_843122_19C480B9 X-CRM114-Status: GOOD ( 12.99 ) 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. Signed-off-by: André Draszik Reviewed-by: Krzysztof Kozlowski --- 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 77dd61c30681b8f0a2f23063ad5f7eb52f5b7158..4c66e38145b02638c48685580c7943bdf79bfbd4 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, 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); }