Skip to contentSkip to conversation

mfd: macsmc: Remove error prints for devm_add_action_or_reset()

PATCH Applied Waqar Hameed 3 participants 3 messages Aug 5, 2025 – Sep 2, 2025

Subsystems (2)
Multifunction devices (MFD) Arm/Apple machine support
lore
Share & tools
lore

Waqar Hameed

author
#0 lore raw

PATCH v2 1/1 mfd: macsmc: Remove error prints for devm_add_action_or_reset()

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 <[email protected]>

---
Changes in v2:

* Split the patch to one seperate patch for each sub-system.

Link to v1: https://lore.kernel.org/all/[email protected]/

 drivers/mfd/macsmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mfd/macsmc.c +2 -2
index 870c8b2028a8..c8575c9c9f4b 100644
@@ -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

Signature · 1 line
2.39.5
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 8 lines · Waqar Hameed

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 <[email protected]>

---

Reviewed-by Sven Peter <[email protected]>

Thanks,

Sven

maintainer Applied
#2 lore raw

Re: (subset) [PATCH v2] mfd: macsmc: Remove error prints for devm_add_action_or_reset()

In reply to Waqar Hameed
Quoted 8 lines · Waqar Hameed

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.

[...]

Applied, thanks!

[1/1] mfd: macsmc: Remove error prints for devm_add_action_or_reset()

      commit: 342c84507bfc197a0a9fddd6f076befefd5e6c25

--
Lee Jones [李琼斯]