aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Girdwood <lg@opensource.wolfsonmicro.com>2008-07-07 11:08:00 -0400
committerJaroslav Kysela <perex@perex.cz>2008-07-10 03:32:40 -0400
commit8cf7b2b393b26b9ba1ccbeeb271a88e51d58f3e3 (patch)
tree4c3c917857fc4a87f6a8f9eb8d036b4cb818e50c
parente550e17ffeb8cf8db27724eaf2ad05f77388afb9 (diff)
ALSA: asoc: fsl - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
This patch merges struct snd_soc_codec_dai and struct snd_soc_cpu_dai into struct snd_soc_dai for the Freescale PPC platform. Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r--sound/soc/fsl/fsl_dma.c2
-rw-r--r--sound/soc/fsl/fsl_dma.h2
-rw-r--r--sound/soc/fsl/fsl_ssi.c24
-rw-r--r--sound/soc/fsl/fsl_ssi.h4
-rw-r--r--sound/soc/fsl/mpc8610_hpcd.c4
5 files changed, 18 insertions, 18 deletions
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 78de7168d2ba..da2bc5902864 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -282,7 +282,7 @@ static irqreturn_t fsl_dma_isr(int irq, void *dev_id)
282 * once for each .dai_link in the machine driver's snd_soc_machine 282 * once for each .dai_link in the machine driver's snd_soc_machine
283 * structure. 283 * structure.
284 */ 284 */
285static int fsl_dma_new(struct snd_card *card, struct snd_soc_codec_dai *dai, 285static int fsl_dma_new(struct snd_card *card, struct snd_soc_dai *dai,
286 struct snd_pcm *pcm) 286 struct snd_pcm *pcm)
287{ 287{
288 static u64 fsl_dma_dmamask = DMA_BIT_MASK(32); 288 static u64 fsl_dma_dmamask = DMA_BIT_MASK(32);
diff --git a/sound/soc/fsl/fsl_dma.h b/sound/soc/fsl/fsl_dma.h
index 430a6ce8b0d0..385d4a42603c 100644
--- a/sound/soc/fsl/fsl_dma.h
+++ b/sound/soc/fsl/fsl_dma.h
@@ -126,7 +126,7 @@ struct fsl_dma_link_descriptor {
126 u8 res[4]; /* Reserved */ 126 u8 res[4]; /* Reserved */
127} __attribute__ ((aligned(32), packed)); 127} __attribute__ ((aligned(32), packed));
128 128
129/* DMA information needed to create a snd_soc_cpu_dai object 129/* DMA information needed to create a snd_soc_dai object
130 * 130 *
131 * ssi_stx_phys: bus address of SSI STX register to use 131 * ssi_stx_phys: bus address of SSI STX register to use
132 * ssi_srx_phys: bus address of SSI SRX register to use 132 * ssi_srx_phys: bus address of SSI SRX register to use
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index f588545698f3..71bff33f5528 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -82,7 +82,7 @@ struct fsl_ssi_private {
82 struct device *dev; 82 struct device *dev;
83 unsigned int playback; 83 unsigned int playback;
84 unsigned int capture; 84 unsigned int capture;
85 struct snd_soc_cpu_dai cpu_dai; 85 struct snd_soc_dai cpu_dai;
86 struct device_attribute dev_attr; 86 struct device_attribute dev_attr;
87 87
88 struct { 88 struct {
@@ -479,7 +479,7 @@ static void fsl_ssi_shutdown(struct snd_pcm_substream *substream)
479 * @freq: the frequency of the given clock ID, currently ignored 479 * @freq: the frequency of the given clock ID, currently ignored
480 * @dir: SND_SOC_CLOCK_IN (clock slave) or SND_SOC_CLOCK_OUT (clock master) 480 * @dir: SND_SOC_CLOCK_IN (clock slave) or SND_SOC_CLOCK_OUT (clock master)
481 */ 481 */
482static int fsl_ssi_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, 482static int fsl_ssi_set_sysclk(struct snd_soc_dai *cpu_dai,
483 int clk_id, unsigned int freq, int dir) 483 int clk_id, unsigned int freq, int dir)
484{ 484{
485 485
@@ -497,7 +497,7 @@ static int fsl_ssi_set_sysclk(struct snd_soc_cpu_dai *cpu_dai,
497 * 497 *
498 * @format: one of SND_SOC_DAIFMT_xxx 498 * @format: one of SND_SOC_DAIFMT_xxx
499 */ 499 */
500static int fsl_ssi_set_fmt(struct snd_soc_cpu_dai *cpu_dai, unsigned int format) 500static int fsl_ssi_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int format)
501{ 501{
502 return (format == SND_SOC_DAIFMT_I2S) ? 0 : -EINVAL; 502 return (format == SND_SOC_DAIFMT_I2S) ? 0 : -EINVAL;
503} 503}
@@ -505,7 +505,7 @@ static int fsl_ssi_set_fmt(struct snd_soc_cpu_dai *cpu_dai, unsigned int format)
505/** 505/**
506 * fsl_ssi_dai_template: template CPU DAI for the SSI 506 * fsl_ssi_dai_template: template CPU DAI for the SSI
507 */ 507 */
508static struct snd_soc_cpu_dai fsl_ssi_dai_template = { 508static struct snd_soc_dai fsl_ssi_dai_template = {
509 .playback = { 509 .playback = {
510 /* The SSI does not support monaural audio. */ 510 /* The SSI does not support monaural audio. */
511 .channels_min = 2, 511 .channels_min = 2,
@@ -569,15 +569,15 @@ static ssize_t fsl_sysfs_ssi_show(struct device *dev,
569} 569}
570 570
571/** 571/**
572 * fsl_ssi_create_dai: create a snd_soc_cpu_dai structure 572 * fsl_ssi_create_dai: create a snd_soc_dai structure
573 * 573 *
574 * This function is called by the machine driver to create a snd_soc_cpu_dai 574 * This function is called by the machine driver to create a snd_soc_dai
575 * structure. The function creates an ssi_private object, which contains 575 * structure. The function creates an ssi_private object, which contains
576 * the snd_soc_cpu_dai. It also creates the sysfs statistics device. 576 * the snd_soc_dai. It also creates the sysfs statistics device.
577 */ 577 */
578struct snd_soc_cpu_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info) 578struct snd_soc_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info)
579{ 579{
580 struct snd_soc_cpu_dai *fsl_ssi_dai; 580 struct snd_soc_dai *fsl_ssi_dai;
581 struct fsl_ssi_private *ssi_private; 581 struct fsl_ssi_private *ssi_private;
582 int ret = 0; 582 int ret = 0;
583 struct device_attribute *dev_attr; 583 struct device_attribute *dev_attr;
@@ -588,7 +588,7 @@ struct snd_soc_cpu_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info)
588 return NULL; 588 return NULL;
589 } 589 }
590 memcpy(&ssi_private->cpu_dai, &fsl_ssi_dai_template, 590 memcpy(&ssi_private->cpu_dai, &fsl_ssi_dai_template,
591 sizeof(struct snd_soc_cpu_dai)); 591 sizeof(struct snd_soc_dai));
592 592
593 fsl_ssi_dai = &ssi_private->cpu_dai; 593 fsl_ssi_dai = &ssi_private->cpu_dai;
594 dev_attr = &ssi_private->dev_attr; 594 dev_attr = &ssi_private->dev_attr;
@@ -623,11 +623,11 @@ struct snd_soc_cpu_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info)
623EXPORT_SYMBOL_GPL(fsl_ssi_create_dai); 623EXPORT_SYMBOL_GPL(fsl_ssi_create_dai);
624 624
625/** 625/**
626 * fsl_ssi_destroy_dai: destroy the snd_soc_cpu_dai object 626 * fsl_ssi_destroy_dai: destroy the snd_soc_dai object
627 * 627 *
628 * This function undoes the operations of fsl_ssi_create_dai() 628 * This function undoes the operations of fsl_ssi_create_dai()
629 */ 629 */
630void fsl_ssi_destroy_dai(struct snd_soc_cpu_dai *fsl_ssi_dai) 630void fsl_ssi_destroy_dai(struct snd_soc_dai *fsl_ssi_dai)
631{ 631{
632 struct fsl_ssi_private *ssi_private = 632 struct fsl_ssi_private *ssi_private =
633 container_of(fsl_ssi_dai, struct fsl_ssi_private, cpu_dai); 633 container_of(fsl_ssi_dai, struct fsl_ssi_private, cpu_dai);
diff --git a/sound/soc/fsl/fsl_ssi.h b/sound/soc/fsl/fsl_ssi.h
index c5ce88e15651..83b44d700e33 100644
--- a/sound/soc/fsl/fsl_ssi.h
+++ b/sound/soc/fsl/fsl_ssi.h
@@ -217,8 +217,8 @@ struct fsl_ssi_info {
217 struct device *dev; 217 struct device *dev;
218}; 218};
219 219
220struct snd_soc_cpu_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info); 220struct snd_soc_dai *fsl_ssi_create_dai(struct fsl_ssi_info *ssi_info);
221void fsl_ssi_destroy_dai(struct snd_soc_cpu_dai *fsl_ssi_dai); 221void fsl_ssi_destroy_dai(struct snd_soc_dai *fsl_ssi_dai);
222 222
223#endif 223#endif
224 224
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 8820c3f8d171..59d7e49bd661 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -96,8 +96,8 @@ static int mpc8610_hpcd_machine_probe(struct platform_device *sound_device)
96static int mpc8610_hpcd_startup(struct snd_pcm_substream *substream) 96static int mpc8610_hpcd_startup(struct snd_pcm_substream *substream)
97{ 97{
98 struct snd_soc_pcm_runtime *rtd = substream->private_data; 98 struct snd_soc_pcm_runtime *rtd = substream->private_data;
99 struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; 99 struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
100 struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; 100 struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
101 struct mpc8610_hpcd_data *machine_data = 101 struct mpc8610_hpcd_data *machine_data =
102 rtd->socdev->dev->platform_data; 102 rtd->socdev->dev->platform_data;
103 int ret = 0; 103 int ret = 0;