[ALSA] aoa: set device pointer in pcms

This patch makes a few whitespace cleanups and makes i2sbus assign the new
struct device pointer in struct snd_pcm so that the proper device symlink
shows up in sysfs.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

diff --git a/sound/aoa/core/snd-aoa-alsa.c b/sound/aoa/core/snd-aoa-alsa.c
index b42fdea77ed04a4f36f37d3e0f64ad02f6c20b9d..8c5a19bd602afcdff2377e3cafad4e7a39ca5e31 100644 (file)
--- a/sound/aoa/core/snd-aoa-alsa.c
+++ b/sound/aoa/core/snd-aoa-alsa.c
@@ -59,7 +59,7 @@ void aoa_alsa_cleanup(void)
 }
 
 int aoa_snd_device_new(snd_device_type_t type,
-        void * device_data, struct snd_device_ops * ops)
+                      void * device_data, struct snd_device_ops * ops)
 {
        struct snd_card *card = aoa_get_card();
        int err;

diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c b/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
index 5eff30b10201c849b89b83a7e7d01a1ba2377ec6..051bb9b200eee454f6a0b62cc992c41e1c6288f1 100644 (file)
--- a/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
@@ -901,11 +901,7 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
        }
 
        if (!dev->pcm) {
-               err = snd_pcm_new(card,
-                                 dev->pcmname,
-                                 dev->pcmid,
-                                 0,
-                                 0,
+               err = snd_pcm_new(card, dev->pcmname, dev->pcmid, 0, 0,
                                  &dev->pcm);
                if (err) {
                        printk(KERN_DEBUG "i2sbus: failed to create pcm\n");
@@ -915,6 +911,7 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
                        module_put(THIS_MODULE);
                        return err;
                }
+               dev->pcm->dev = &dev->ofdev.dev;
        }
 
        /* ALSA yet again sucks.