]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: cs-amp-lib: Simplify overcomplicated error return
authorRichard Fitzgerald <rf@opensource.cirrus.com>
Thu, 28 May 2026 14:46:32 +0000 (15:46 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 28 May 2026 15:16:34 +0000 (16:16 +0100)
In cs_amp_devm_get_dell_ssidex() remove an unnecessary special case check
on -ENOENT that just returned -ENOENT. The other branch of the if()
statement returned the error, which would of course return -ENOENT if the
error was -ENOENT and so do exactly the same as the first branch.

The whole if statement is identical to just returning the original pointer
if it is an error value.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20260528144632.130197-1-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs-amp-lib.c

index fb5b950e584c8a7fc4327f1656aab444974dac3c..371e99205b58e2835c8e9e6e6ef8ea580ad8bd3c 100644 (file)
@@ -748,10 +748,7 @@ static const char *cs_amp_devm_get_dell_ssidex(struct device *dev,
        char *ssidex_buf __free(kfree) = cs_amp_alloc_get_efi_variable(DELL_SSIDEXV2_EFI_NAME,
                                                                       &DELL_SSIDEXV2_EFI_GUID,
                                                                       NULL);
-       ret = PTR_ERR_OR_ZERO(ssidex_buf);
-       if (ret == -ENOENT)
-               return ERR_PTR(-ENOENT);
-       else if (ret < 0)
+       if (IS_ERR(ssidex_buf))
                return ssidex_buf;
 
        /*