[PATCH v2] mfd: macsmc: Remove error prints for devm_add_action_or_reset()
From: Waqar Hameed <hidden>
Date: 2025-08-05 09:33:45
Also in:
asahi, lkml
Subsystem:
arm/apple machine support, multifunction devices (mfd), the rest · Maintainers:
Sven Peter, Janne Grunau, Lee Jones, Linus Torvalds
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 <redacted> --- 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/ (local) 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