Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
To: alsa-devel@alsa-project.org
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Arnaud Patard <arnaud.patard@rtp-net.org>,
	Liam Girdwood <lrg@slimlogic.co.uk>
Subject: [patch 1/1] ASoC: OpenRD Client : Fix naming breakage due to multicomponent support
Date: Mon, 30 Aug 2010 16:00:05 +0200	[thread overview]
Message-ID: <20100830140015.356460045@rtp-net.org> (raw)
In-Reply-To: 20100830140004.266980003@rtp-net.org

[-- Attachment #1: conversion_fixes.patch --]
[-- Type: text/plain, Size: 1663 bytes --]

multicomponent support added/changed some device name but added some typos,
breaking existing OpenRD Client support.


Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>

Index: sound-2.6/arch/arm/mach-kirkwood/common.c
===================================================================
--- sound-2.6.orig/arch/arm/mach-kirkwood/common.c	2010-08-23 10:13:13.000000000 +0200
+++ sound-2.6/arch/arm/mach-kirkwood/common.c	2010-08-23 10:13:14.000000000 +0200
@@ -905,7 +905,7 @@
 };
 
 static struct platform_device kirkwood_pcm_device = {
-	.name		= "kirkwood-pcm",
+	.name		= "kirkwood-pcm-audio",
 	.id		= -1,
 };
 
Index: sound-2.6/sound/soc/kirkwood/kirkwood-openrd.c
===================================================================
--- sound-2.6.orig/sound/soc/kirkwood/kirkwood-openrd.c	2010-08-23 10:11:33.000000000 +0200
+++ sound-2.6/sound/soc/kirkwood/kirkwood-openrd.c	2010-08-23 10:13:14.000000000 +0200
@@ -66,7 +66,7 @@
 	.stream_name = "CS42L51 HiFi",
 	.cpu_dai_name = "kirkwood-i2s",
 	.platform_name = "kirkwood-pcm-audio",
-	.codec_dai_name = "cs42l51_hifi",
+	.codec_dai_name = "cs42l51-hifi",
 	.codec_name = "cs42l51-codec.0-004a",
 	.ops = &openrd_client_ops,
 },
Index: sound-2.6/sound/soc/codecs/cs42l51.c
===================================================================
--- sound-2.6.orig/sound/soc/codecs/cs42l51.c	2010-08-30 15:56:38.000000000 +0200
+++ sound-2.6/sound/soc/codecs/cs42l51.c	2010-08-30 15:56:53.000000000 +0200
@@ -622,7 +622,7 @@
 
 static struct i2c_driver cs42l51_i2c_driver = {
 	.driver = {
-		.name = "cs42L51-codec",
+		.name = "cs42l51-codec",
 		.owner = THIS_MODULE,
 	},
 	.id_table = cs42l51_id,

       reply	other threads:[~2010-08-30 14:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20100830140004.266980003@rtp-net.org>
2010-08-30 14:00 ` Arnaud Patard [this message]
2010-08-30 14:39   ` [patch 1/1] ASoC: OpenRD Client : Fix naming breakage due to multicomponent support Liam Girdwood
2010-08-31 12:57   ` 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=20100830140015.356460045@rtp-net.org \
    --to=arnaud.patard@rtp-net.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=lrg@slimlogic.co.uk \
    /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