alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Mike Frysinger <vapier@gentoo.org>
To: alsa-devel@alsa-project.org, Liam Girdwood <lrg@slimlogic.co.uk>,
	Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: uclinux-dist-devel@blackfin.uclinux.org
Subject: [PATCH 1/3] ASoC: Blackfin: drop "-codec" from codec names
Date: Mon, 28 Mar 2011 01:45:08 -0400	[thread overview]
Message-ID: <1301291110-2443-1-git-send-email-vapier@gentoo.org> (raw)

The recent multi-component patch incorrectly added "-codec" suffixes to
parts which are not MFD.  Drop the suffix from the machine drivers too.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 sound/soc/blackfin/bf5xx-ad1836.c  |    2 +-
 sound/soc/blackfin/bf5xx-ad193x.c  |    2 +-
 sound/soc/blackfin/bf5xx-ad1980.c  |    2 +-
 sound/soc/blackfin/bf5xx-ad73311.c |    2 +-
 sound/soc/blackfin/bf5xx-ssm2602.c |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c
index 83012da..826bae6 100644
--- a/sound/soc/blackfin/bf5xx-ad1836.c
+++ b/sound/soc/blackfin/bf5xx-ad1836.c
@@ -85,7 +85,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai = {
 	.cpu_dai_name = "bf5xx-tdm",
 	.codec_dai_name = "ad1836-hifi",
 	.platform_name = "bf5xx-tdm-pcm-audio",
-	.codec_name = "ad1836-codec.0",
+	.codec_name = "ad1836.0",
 	.ops = &bf5xx_ad1836_ops,
 };
 
diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c
index 3367882..5794d09 100644
--- a/sound/soc/blackfin/bf5xx-ad193x.c
+++ b/sound/soc/blackfin/bf5xx-ad193x.c
@@ -113,7 +113,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai = {
 	.cpu_dai_name = "bf5xx-tdm",
 	.codec_dai_name ="ad193x-hifi",
 	.platform_name = "bf5xx-tdm-pcm-audio",
-	.codec_name = "ad193x-codec.5",
+	.codec_name = "ad193x.5",
 	.ops = &bf5xx_ad193x_ops,
 };
 
diff --git a/sound/soc/blackfin/bf5xx-ad1980.c b/sound/soc/blackfin/bf5xx-ad1980.c
index d57c9c9..c147130 100644
--- a/sound/soc/blackfin/bf5xx-ad1980.c
+++ b/sound/soc/blackfin/bf5xx-ad1980.c
@@ -73,7 +73,7 @@ static struct snd_soc_dai_link bf5xx_board_dai = {
 	.cpu_dai_name = "bfin-ac97",
 	.codec_dai_name = "ad1980-hifi",
 	.platform_name = "bfin-pcm-audio",
-	.codec_name = "ad1980-codec",
+	.codec_name = "ad1980",
 	.ops = &bf5xx_board_ops,
 };
 
diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c
index 732fb8b..1655f95 100644
--- a/sound/soc/blackfin/bf5xx-ad73311.c
+++ b/sound/soc/blackfin/bf5xx-ad73311.c
@@ -186,7 +186,7 @@ static struct snd_soc_dai_link bf5xx_ad73311_dai = {
 	.cpu_dai_name = "bf5xx-i2s",
 	.codec_dai_name = "ad73311-hifi",
 	.platform_name = "bfin-pcm-audio",
-	.codec_name = "ad73311-codec",
+	.codec_name = "ad73311",
 	.ops = &bf5xx_ad73311_ops,
 };
 
diff --git a/sound/soc/blackfin/bf5xx-ssm2602.c b/sound/soc/blackfin/bf5xx-ssm2602.c
index ad28663..732a02f 100644
--- a/sound/soc/blackfin/bf5xx-ssm2602.c
+++ b/sound/soc/blackfin/bf5xx-ssm2602.c
@@ -119,7 +119,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai = {
 	.cpu_dai_name = "bf5xx-i2s",
 	.codec_dai_name = "ssm2602-hifi",
 	.platform_name = "bf5xx-pcm-audio",
-	.codec_name = "ssm2602-codec.0-001b",
+	.codec_name = "ssm2602.0-001b",
 	.ops = &bf5xx_ssm2602_ops,
 };
 
-- 
1.7.4.1

             reply	other threads:[~2011-03-28  6:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-28  5:45 Mike Frysinger [this message]
2011-03-28  5:45 ` [PATCH 2/3] ASoC: Blackfin: standardize machine driver names Mike Frysinger
2011-03-28  5:45 ` [PATCH 3/3] ASoC: Blackfin: push down SPORT settings from global variables Mike Frysinger
2011-04-07 18:55   ` [uclinux-dist-devel] " Mike Frysinger
2011-04-07 23:25     ` Mark Brown
2011-03-28 19:25 ` [uclinux-dist-devel] [PATCH 1/3] ASoC: Blackfin: drop "-codec" from codec names Mike Frysinger
2011-03-29 20:30 ` Liam Girdwood
2011-03-29 22:19 ` 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=1301291110-2443-1-git-send-email-vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=lrg@slimlogic.co.uk \
    --cc=uclinux-dist-devel@blackfin.uclinux.org \
    /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;
as well as URLs for NNTP newsgroup(s).