[PATCH v2] ASoC: ti: rx51: remove stale reference to machine_is_nokia_rx51()

[PATCH v2] ASoC: ti: rx51: remove stale reference to machine_is_nokia_rx51()

[Ethan Nelson-Moore]

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>
---
Changes from v1: Fix mistake in commit message - machine ID checks
still work with DT booting if the bootloader passes the ID

 sound/soc/ti/rx51.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sound/soc/ti/rx51.c b/sound/soc/ti/rx51.c
index 7eeb12e5066c..cfc23e0838c2 100644
--- a/sound/soc/ti/rx51.c
+++ b/sound/soc/ti/rx51.c
@@ -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;
-- 
2.43.0

Re: [PATCH v2] ASoC: ti: rx51: remove stale reference to machine_is_nokia_rx51()

[Jarkko Nikula]

On 10/05/2026 8:42 am, Ethan Nelson-Moore wrote:
> 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>
> ---
> Changes from v1: Fix mistake in commit message - machine ID checks
> still work with DT booting if the bootloader passes the ID
>
>  sound/soc/ti/rx51.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>

Re: [PATCH v2] ASoC: ti: rx51: remove stale reference to machine_is_nokia_rx51()

[Mark Brown]

On Sat, 09 May 2026 22:42:14 -0700, Ethan Nelson-Moore wrote:
> ASoC: ti: rx51: remove stale reference to machine_is_nokia_rx51()

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.2

Thanks!

[1/1] ASoC: ti: rx51: remove stale reference to machine_is_nokia_rx51()
      https://git.kernel.org/broonie/sound/c/ee05c329c048

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark