ALSA: es1688: allocate snd_es1688 structure as a part of snd_card structure

Allocate the snd_es1688 during the snd_card allocation.
This allows to remove the card pointer from the snd_es1688 structure.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 5 insertions, 5 deletions

diff --git a/include/sound/es1688.h b/include/sound/es1688.h
index 10fcf1465810..4c29572effb2 100644
--- a/include/sound/es1688.h
+++ b/include/sound/es1688.h
@@ -44,7 +44,6 @@ struct snd_es1688 {
         unsigned char pad;
         unsigned int dma_size;
 
-        struct snd_card *card;
         struct snd_pcm *pcm;
         struct snd_pcm_substream *playback_substream;
         struct snd_pcm_substream *capture_substream;
@@ -108,14 +107,15 @@ struct snd_es1688 {
 void snd_es1688_mixer_write(struct snd_es1688 *chip, unsigned char reg, unsigned char data);
 
 int snd_es1688_create(struct snd_card *card,
+                      struct snd_es1688 *chip,
                       unsigned long port,
                       unsigned long mpu_port,
                       int irq,
                       int mpu_irq,
                       int dma8,
-                      unsigned short hardware,
-                      struct snd_es1688 ** rchip);
-int snd_es1688_pcm(struct snd_es1688 *chip, int device, struct snd_pcm ** rpcm);
-int snd_es1688_mixer(struct snd_es1688 *chip);
+                      unsigned short hardware);
+int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip, int device,
+                   struct snd_pcm **rpcm);
+int snd_es1688_mixer(struct snd_card *card, struct snd_es1688 *chip);
 
 #endif /* __SOUND_ES1688_H */