From: Waqar Hameed <waqar.hameed@axis.com>
To: Sven Peter <sven@kernel.org>, Janne Grunau <j@jannau.net>,
"Alyssa Rosenzweig" <alyssa@rosenzweig.io>,
Neal Gompa <neal@gompa.dev>, Lee Jones <lee@kernel.org>
Cc: <kernel@axis.com>, <asahi@lists.linux.dev>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v2] mfd: macsmc: Remove error prints for devm_add_action_or_reset()
Date: Tue, 5 Aug 2025 11:33:34 +0200 [thread overview]
Message-ID: <pnd8qjym7td.a.out@axis.com> (raw)
When `devm_add_action_or_reset()` fails, it is due to a failed memory
allocation and will thus return `-ENOMEM`. `dev_err_probe()` doesn't do
anything when error is `-ENOMEM`. Therefore, remove the useless call to
`dev_err_probe()` when `devm_add_action_or_reset()` fails, and just
return the value instead.
Signed-off-by: Waqar Hameed <waqar.hameed@axis.com>
---
Changes in v2:
* Split the patch to one seperate patch for each sub-system.
Link to v1: https://lore.kernel.org/all/pnd7c0s6ji2.fsf@axis.com/
drivers/mfd/macsmc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/macsmc.c b/drivers/mfd/macsmc.c
index 870c8b2028a8..c8575c9c9f4b 100644
--- a/drivers/mfd/macsmc.c
+++ b/drivers/mfd/macsmc.c
@@ -429,7 +429,7 @@ static int apple_smc_probe(struct platform_device *pdev)
ret = devm_add_action_or_reset(dev, apple_smc_rtkit_shutdown, smc);
if (ret)
- return dev_err_probe(dev, ret, "Failed to register rtkit shutdown action");
+ return ret;
ret = apple_rtkit_start_ep(smc->rtk, SMC_ENDPOINT);
if (ret)
@@ -465,7 +465,7 @@ static int apple_smc_probe(struct platform_device *pdev)
apple_smc_write_flag(smc, SMC_KEY(NTAP), true);
ret = devm_add_action_or_reset(dev, apple_smc_disable_notifications, smc);
if (ret)
- return dev_err_probe(dev, ret, "Failed to register notification disable action");
+ return ret;
ret = devm_mfd_add_devices(smc->dev, PLATFORM_DEVID_NONE,
apple_smc_devs, ARRAY_SIZE(apple_smc_devs),
base-commit: 260f6f4fda93c8485c8037865c941b42b9cba5d2
--
2.39.5
next reply other threads:[~2025-08-05 9:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-05 9:33 Waqar Hameed [this message]
2025-08-06 18:49 ` [PATCH v2] mfd: macsmc: Remove error prints for devm_add_action_or_reset() Sven Peter
2025-09-02 8:13 ` (subset) " Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pnd8qjym7td.a.out@axis.com \
--to=waqar.hameed@axis.com \
--cc=alyssa@rosenzweig.io \
--cc=asahi@lists.linux.dev \
--cc=j@jannau.net \
--cc=kernel@axis.com \
--cc=lee@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neal@gompa.dev \
--cc=sven@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox