From patchwork Mon Feb 9 23:57:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lopez Cruz, Misael" X-Patchwork-Id: 6320 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n19NvCY7026673 for ; Mon, 9 Feb 2009 23:57:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750712AbZBIX5L (ORCPT ); Mon, 9 Feb 2009 18:57:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751920AbZBIX5L (ORCPT ); Mon, 9 Feb 2009 18:57:11 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:50918 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750712AbZBIX5K convert rfc822-to-8bit (ORCPT ); Mon, 9 Feb 2009 18:57:10 -0500 Received: from dlep95.itg.ti.com ([157.170.170.107]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id n19Nv24a006137; Mon, 9 Feb 2009 17:57:07 -0600 Received: from dlee75.ent.ti.com (localhost [127.0.0.1]) by dlep95.itg.ti.com (8.13.8/8.13.8) with ESMTP id n19Nv2Ng010877; Mon, 9 Feb 2009 17:57:02 -0600 (CST) Received: from dlee07.ent.ti.com ([157.170.170.80]) by dlee75.ent.ti.com ([157.170.170.72]) with mapi; Mon, 9 Feb 2009 17:57:02 -0600 From: "Lopez Cruz, Misael" To: "alsa-devel-request@alsa-project.org" CC: "linux-omap@vger.kernel.org" , "Nagalla, Hari" Date: Mon, 9 Feb 2009 17:57:00 -0600 Subject: [PATCH] ASoC: Replace snd_soc_machine by snd_soc_card structure in SDP3430 machine driver Thread-Topic: [PATCH] ASoC: Replace snd_soc_machine by snd_soc_card structure in SDP3430 machine driver Thread-Index: AcmLEhkJ9nzZTJVYQWOFGTIriOdARQ== Message-ID: <2C7D3DF36ADFFC479B44490D912B616705D6175398@dlee07.ent.ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This patch replaces "snd_soc_machine" structure by "snd_soc_card" in SP3430 driver. This change is needed in SDP3430 driver to reflect changes introduced by "ASoC: Rename snd_soc_card to snd_soc_machine" patch (875065491fba8eb13219f16c36e79a6fb4e15c68). Signed-off-by: Misael Lopez Cruz Acked-by: Jarkko Nikula --- sound/soc/omap/sdp3430.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index ad97836..e226fa7 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c @@ -91,7 +91,7 @@ static struct snd_soc_dai_link sdp3430_dai = { }; /* Audio machine driver */ -static struct snd_soc_machine snd_soc_machine_sdp3430 = { +static struct snd_soc_card snd_soc_sdp3430 = { .name = "SDP3430", .platform = &omap_soc_platform, .dai_link = &sdp3430_dai, @@ -100,7 +100,7 @@ static struct snd_soc_machine snd_soc_machine_sdp3430 = { /* Audio subsystem */ static struct snd_soc_device sdp3430_snd_devdata = { - .machine = &snd_soc_machine_sdp3430, + .card = &snd_soc_sdp3430, .codec_dev = &soc_codec_dev_twl4030, };