]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: ti: rx51: remove stale reference to machine_is_nokia_rx51()
authorEthan Nelson-Moore <enelsonmoore@gmail.com>
Sun, 10 May 2026 05:42:14 +0000 (22:42 -0700)
committerMark Brown <broonie@kernel.org>
Sun, 10 May 2026 13:46:22 +0000 (22:46 +0900)
The rx51 driver relies on the machine_is_nokia_rx51() macro, which was
used with the legacy board file dropped in commit 9b7141d01a76 ("ARM:
OMAP2+: Drop legacy board file for n900"). The use of this macro
prevents the removal of machine IDs no longer used by the kernel from
arch/arm/tools/mach-types, because the machine_is_*() macros are
generated from mach-types. Drop this unused code.

Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com> # v1
Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Link: https://patch.msgid.link/20260510054214.564950-1-enelsonmoore@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/ti/rx51.c

index 7eeb12e5066c4a0d3c886dafbd76bfb5cd7b901b..cfc23e0838c25e3aca1445d9a5586274c6c3f10c 100644 (file)
@@ -19,8 +19,6 @@
 #include <sound/soc.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
-#include <asm/mach-types.h>
-
 #include "omap-mcbsp.h"
 
 enum {
@@ -364,7 +362,7 @@ static int rx51_soc_probe(struct platform_device *pdev)
        struct snd_soc_card *card = &rx51_sound_card;
        int err;
 
-       if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
+       if (!of_machine_is_compatible("nokia,omap3-n900"))
                return -ENODEV;
 
        card->dev = &pdev->dev;