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: 13996470 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22528271297 for ; Fri, 28 Feb 2025 14:07:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740751656; cv=none; b=C8dFHDsxeymu33r7FufZ/7APRKcp4Tk+svfQoovxLYw0Iiu4gVwC4Bc5ubex9hztum/6GLMzieylHaTPPGdHEkm0NOtTOc1FhPHRi0PGP+iVvuSmj+4noW8s85MF6DJyU0OodqWKHw6b6l5xAdXWQvfrwGux1aZ+4AzJ+qPldNY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740751656; c=relaxed/simple; bh=v9dyh7vGu2dacgwW0mj5cIBOkYcMAu4WL7myCF88UoA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tWphoSqWP9YtCAqLqnq5rcc2UquPhaFR4svX3qFhaqrOSyqd43QqJhB1iKVFc5cV7hQjzII2X6pVKDBo1GzC7vVU7hum+dzJypUpp9yGgSWcTBnfXZ3+nXCDGjM9mOXAdo3M/RoGCp8LtWLpYn65oCblPUCdPUCiIN+xGxOzxYI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=psEjhImf; arc=none smtp.client-ip=209.85.208.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="psEjhImf" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5e0939c6456so2923299a12.3 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=vger.kernel.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=psEjhImf2z84Zyymr3jbDWSwcYu5wLvmzNG5Roh6x2DrxXe9THSO4gG6ngM8t8t0rN yDWLM7aqWx8COqo9pvgwZotIU0b5zrL9jSEgYObInU2IafnBc7laTM79iC9aYSxcv2Px lQFUYj1ZD7ZYqeJhwY5xWZg7Qj/ZJ0kDT37yFx6bDwsWMWTLrf9nzHtpke//CQ0qygpO 2S6U81Mi9ZHfpk0YQ4WC4Sue43tVFZLjEXOrzdZJKdM/vtV0uhCjeGu8vWhGz3U+8On9 TPzL+LrvVv20TXxvYA3/GRm4N895UZfD+3tbOVkIuh0Whyq+0nB3IXAtWV0GIZx3ofWu BZJA== 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=wIlifPvYnJ6GvNQ5kan6Z0t+Q/CiTahaLBEDxZoDCzaxP6ScYqnNgvyfNKUkzatHw6 sUblxt2tQDG+VV9VWEbEhCMauAbay87ETYxwq0v9G/q4qAUl8/KnbxOG9MewiUJ0q/Kz 7UfcWjNGQP4UshOUlb7ke3Wc33A99S1HEUel7s4oqh7LQWGZJ6zHz3Sl6uhoMZ0ZYPdZ GCPVCMg2j2AWM6xJf3RZ721UNTc0dwsF+X4yAYuyBjs5Y+jSQbD71UtPihLDyoeO1rXN zgj+BpJ+VCWJ2Hz+18t//qXSMf6TMo1Ft4xt+15TiR1CNazRNOdPbxh3zZT1qVMi3gWT 3o7A== X-Forwarded-Encrypted: i=1; AJvYcCUSt+y1mIcp3aEHwMdBg5IjHHJxxrKWzdGc9f4A7vva/RbEQvlthxBrc7nCFzk0KIaOqkYEbeMG1/wygkjTAI5+fw==@vger.kernel.org X-Gm-Message-State: AOJu0YwUaD2MQcBNxa8Dl9UneepW0+vEjF5DamS/jSbpdyuK89PjSjP6 vnQLnMaZtL+0CwI/HfBd2ZfCqDOuhZzMP3nTw5SyKSZi+IumIHbXisYCDTG3RZ0= X-Gm-Gg: ASbGnct1iex3r4mcTKCDTcpqYj0DXIoXSQGE7B4WDX0E6UDeSfIIWN/1oRIOiq6512u 4WPUbihe7F8dh75k5HZuL2lrocXy62s75g6S/oM3ZlnvTtNDOLzKeiEeaTbRzJV0dK61k4tAtSB wbJMNNlnOWP/YsrfZXjhLDfzsbNeBD2iygJ7v1E4AE/bBHJ8XTjX/2nczPEMqGUKAuvMiREcEtb woUQt35lbAClLk8E5J9FjdqVz/O0AOpgVYLsex5cZxULK/kqOtmRUrnwO+cM/psC1K/mh2xJ2KO BKhehmOAug6YbmKW2ksa/Yjzmv2ToAfyvLqMNiTaPcW6Uf59JiYDXTdO6KfQpqONOck/ocwWhaw 8so+kulphbw== 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 Precedence: bulk X-Mailing-List: linux-samsung-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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); }