]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mfd: macsmc: Remove error prints for devm_add_action_or_reset()
authorWaqar Hameed <waqar.hameed@axis.com>
Tue, 5 Aug 2025 09:33:34 +0000 (11:33 +0200)
committerLee Jones <lee@kernel.org>
Wed, 1 Oct 2025 09:28:19 +0000 (10:28 +0100)
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>
Reviewed-by: Sven Peter <sven@kernel.org>
Link: https://lore.kernel.org/r/pnd8qjym7td.a.out@axis.com
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/mfd/macsmc.c

index 870c8b2028a8fc0e905c8934c2636824cbe5d527..c8575c9c9f4be8f715124badc9ff1ba66a0f5be2 100644 (file)
@@ -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),