Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (365 commits)
  ALSA: hda - Disable sticky PCM stream assignment for AD codecs
  ALSA: usb - Creative USB X-Fi volume knob support
  ALSA: ca0106: Use card specific dac id for mute controls.
  ALSA: ca0106: Allow different sound cards to use different SPI channel mappings.
  ALSA: ca0106: Create a nice spot for mapping channels to dacs.
  ALSA: ca0106: Move enabling of front dac out of hardcoded setup sequence.
  ALSA: ca0106: Pull out dac powering routine into separate function.
  ALSA: ca0106 - add Sound Blaster 5.1vx info.
  ASoC: tlv320dac33: Use usleep_range for delays
  ALSA: usb-audio: add Novation Launchpad support
  ALSA: hda - Add workarounds for CT-IBG controllers
  ALSA: hda - Fix wrong TLV mute bit for STAC/IDT codecs
  ASoC: tpa6130a2: Error handling for broken chip
  ASoC: max98088: Staticise m98088_eq_band
  ASoC: soc-core: Fix codec->name memory leak
  ALSA: hda - Apply ideapad quirk to Acer laptops with Cxt5066
  ALSA: hda - Add some workarounds for Creative IBG
  ALSA: hda - Fix wrong SPDIF NID assignment for CA0110
  ALSA: hda - Fix codec rename rules for ALC662-compatible codecs
  ALSA: hda - Add alc_init_jacks() call to other codecs
  ...

1 files changed, 36 insertions, 17 deletions

diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c
index 0d8bdf07729c..c326d29992fe 100644
--- a/sound/soc/sh/dma-sh7760.c
+++ b/sound/soc/sh/dma-sh7760.c
@@ -137,7 +137,7 @@ static void camelot_rxdma(void *data)
 static int camelot_pcm_open(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct camelot_pcm *cam = &cam_pcm_data[rtd->dai->cpu_dai->id];
+        struct camelot_pcm *cam = &cam_pcm_data[rtd->cpu_dai->id];
         int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;
         int ret, dmairq;
 
@@ -150,7 +150,7 @@ static int camelot_pcm_open(struct snd_pcm_substream *substream)
                 ret = dmabrg_request_irq(dmairq, camelot_rxdma, cam);
                 if (unlikely(ret)) {
                         pr_debug("audio unit %d irqs already taken!\n",
-                             rtd->dai->cpu_dai->id);
+                             rtd->cpu_dai->id);
                         return -EBUSY;
                 }
                 (void)dmabrg_request_irq(dmairq + 1,camelot_rxdma, cam);
@@ -159,7 +159,7 @@ static int camelot_pcm_open(struct snd_pcm_substream *substream)
                 ret = dmabrg_request_irq(dmairq, camelot_txdma, cam);
                 if (unlikely(ret)) {
                         pr_debug("audio unit %d irqs already taken!\n",
-                             rtd->dai->cpu_dai->id);
+                             rtd->cpu_dai->id);
                         return -EBUSY;
                 }
                 (void)dmabrg_request_irq(dmairq + 1, camelot_txdma, cam);
@@ -170,7 +170,7 @@ static int camelot_pcm_open(struct snd_pcm_substream *substream)
 static int camelot_pcm_close(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct camelot_pcm *cam = &cam_pcm_data[rtd->dai->cpu_dai->id];
+        struct camelot_pcm *cam = &cam_pcm_data[rtd->cpu_dai->id];
         int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;
         int dmairq;
 
@@ -191,7 +191,7 @@ static int camelot_hw_params(struct snd_pcm_substream *substream,
                              struct snd_pcm_hw_params *hw_params)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct camelot_pcm *cam = &cam_pcm_data[rtd->dai->cpu_dai->id];
+        struct camelot_pcm *cam = &cam_pcm_data[rtd->cpu_dai->id];
         int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;
         int ret;
 
@@ -219,7 +219,7 @@ static int camelot_prepare(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct camelot_pcm *cam = &cam_pcm_data[rtd->dai->cpu_dai->id];
+        struct camelot_pcm *cam = &cam_pcm_data[rtd->cpu_dai->id];
 
         pr_debug("PCM data: addr 0x%08ulx len %d\n",
                  (u32)runtime->dma_addr, runtime->dma_bytes);
@@ -266,7 +266,7 @@ static inline void dmabrg_rec_dma_stop(struct camelot_pcm *cam)
 static int camelot_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct camelot_pcm *cam = &cam_pcm_data[rtd->dai->cpu_dai->id];
+        struct camelot_pcm *cam = &cam_pcm_data[rtd->cpu_dai->id];
         int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;
 
         switch (cmd) {
@@ -293,7 +293,7 @@ static snd_pcm_uframes_t camelot_pos(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct camelot_pcm *cam = &cam_pcm_data[rtd->dai->cpu_dai->id];
+        struct camelot_pcm *cam = &cam_pcm_data[rtd->cpu_dai->id];
         int recv = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 0:1;
         unsigned long pos;
 
@@ -342,25 +342,44 @@ static int camelot_pcm_new(struct snd_card *card,
         return 0;
 }
 
-struct snd_soc_platform sh7760_soc_platform = {
-        .name           = "sh7760-pcm",
+static struct snd_soc_platform sh7760_soc_platform = {
         .pcm_ops        = &camelot_pcm_ops,
         .pcm_new        = camelot_pcm_new,
         .pcm_free       = camelot_pcm_free,
 };
-EXPORT_SYMBOL_GPL(sh7760_soc_platform);
 
-static int __init sh7760_soc_platform_init(void)
+static int __devinit sh7760_soc_platform_probe(struct platform_device *pdev)
 {
-        return snd_soc_register_platform(&sh7760_soc_platform);
+        return snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform);
 }
-module_init(sh7760_soc_platform_init);
 
-static void __exit sh7760_soc_platform_exit(void)
+static int __devexit sh7760_soc_platform_remove(struct platform_device *pdev)
 {
-        snd_soc_unregister_platform(&sh7760_soc_platform);
+        snd_soc_unregister_platform(&pdev->dev);
+        return 0;
+}
+
+static struct platform_driver sh7760_pcm_driver = {
+        .driver = {
+                        .name = "sh7760-pcm-audio",
+                        .owner = THIS_MODULE,
+        },
+
+        .probe = sh7760_soc_platform_probe,
+        .remove = __devexit_p(sh7760_soc_platform_remove),
+};
+
+static int __init snd_sh7760_pcm_init(void)
+{
+        return platform_driver_register(&sh7760_pcm_driver);
+}
+module_init(snd_sh7760_pcm_init);
+
+static void __exit snd_sh7760_pcm_exit(void)
+{
+        platform_driver_unregister(&sh7760_pcm_driver);
 }
-module_exit(sh7760_soc_platform_exit);
+module_exit(snd_sh7760_pcm_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SH7760 Audio DMA (DMABRG) driver");