From: Ethan Nelson-Moore <enelsonmoore@gmail.com>
To: linux-arm-kernel@lists.infradead.org,
linux-sound@vger.kernel.org, linux-omap@vger.kernel.org
Cc: Russell King <linux@armlinux.org.uk>,
Ethan Nelson-Moore <enelsonmoore@gmail.com>,
Peter Ujfalusi <peter.ujfalusi@gmail.com>,
Jarkko Nikula <jarkko.nikula@bitmer.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>
Subject: [PATCH] sound: soc: ti: rx51: remove stale reference to machine_is_nokia_rx51()
Date: Fri, 8 May 2026 18:22:46 -0700 [thread overview]
Message-ID: <20260509012247.14990-1-enelsonmoore@gmail.com> (raw)
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
next reply other threads:[~2026-05-09 1:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-09 1:22 Ethan Nelson-Moore [this message]
2026-05-09 13:07 ` [PATCH] sound: soc: ti: rx51: remove stale reference to machine_is_nokia_rx51() Jarkko Nikula
2026-05-09 16:39 ` Ethan Nelson-Moore
2026-05-10 1:22 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260509012247.14990-1-enelsonmoore@gmail.com \
--to=enelsonmoore@gmail.com \
--cc=broonie@kernel.org \
--cc=jarkko.nikula@bitmer.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=perex@perex.cz \
--cc=peter.ujfalusi@gmail.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox