[PATCH] sound: soc: ti: rx51: remove stale reference to machine_is_nokia_rx51()

[PATCH] sound: soc: 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 is
always false since commit 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board
file for n900"). Its presence prevents the removal of boards no longer
present in the kernel from arch/arm/tools/mach-types, because the
machine_is_*() macros are generated from mach-types. Drop this unused
code.

Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
---
 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] sound: soc: ti: rx51: remove stale reference to machine_is_nokia_rx51()

[Jarkko Nikula]

Hi

On 09/05/2026 4:22 am, Ethan Nelson-Moore wrote:
> The rx51 driver relies on the machine_is_nokia_rx51() macro, which is
> always false since commit 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board
> file for n900"). Its presence prevents the removal of boards no longer
> present in the kernel from arch/arm/tools/mach-types, because the
> machine_is_*() macros are generated from mach-types. Drop this unused
> code.
Not fully true since machine_is_nokia_rx51() still returns true on RX51
(N900) and driver loads successfully both before and after your patch.
But true you may remove this test so please update the commit log and
you may add my tested by tag:

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

Re: [PATCH] sound: soc: ti: rx51: remove stale reference to machine_is_nokia_rx51()

[Ethan Nelson-Moore]

Hi, Jarkko,

On Sat, May 9, 2026 at 6:07 AM Jarkko Nikula <jarkko.nikula@bitmer.com> wrote:
> Not fully true since machine_is_nokia_rx51() still returns true on RX51
> (N900) and driver loads successfully both before and after your patch.

Thank you for testing the patch and pointing this out. I didn't know
the kernel still considered the machine ID passed by the bootloader
when booting with FDT.

> But true you may remove this test so please update the commit log and
> you may add my tested by tag:
>
> Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com>

Okay. I'll resend the patch with your tag and a fixed commit message
after the 24-hour deadline.

Ethan

Re: [PATCH] sound: soc: ti: rx51: remove stale reference to machine_is_nokia_rx51()

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 766 bytes --]

On Fri, May 08, 2026 at 06:22:46PM -0700, Ethan Nelson-Moore wrote:
> The rx51 driver relies on the machine_is_nokia_rx51() macro, which is
> always false since commit 9b7141d01a76 ("ARM: OMAP2+: Drop legacy board
> file for n900"). Its presence prevents the removal of boards no longer
> present in the kernel from arch/arm/tools/mach-types, because the
> machine_is_*() macros are generated from mach-types. Drop this unused
> code.

Please submit patches using subject lines reflecting the style for the
subsystem, this makes it easier for people to identify relevant patches.
Look at what existing commits in the area you're changing are doing and
make sure your subject lines visually resemble what they're doing.
There's no need to resubmit to fix this alone.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]