Merge branch 'topic/misc' into for-linus

3 files changed, 17 insertions, 16 deletions

diff --git a/include/sound/asound.h b/include/sound/asound.h
index 098595500632..9f1eecf99e6b 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -574,7 +574,7 @@ enum {
 #define SNDRV_TIMER_FLG_SLAVE           (1<<0)  /* cannot be controlled */
 
 struct snd_timer_id {
-        int dev_class;  
+        int dev_class;
         int dev_sclass;
         int card;
         int device;
@@ -762,7 +762,7 @@ struct snd_ctl_elem_id {
         snd_ctl_elem_iface_t iface;     /* interface identifier */
         unsigned int device;            /* device/client number */
         unsigned int subdevice;         /* subdevice (substream) number */
-        unsigned char name[44];         /* ASCII name of item */
+        unsigned char name[44];         /* ASCII name of item */
         unsigned int index;             /* index of item */
 };
 
@@ -809,7 +809,7 @@ struct snd_ctl_elem_info {
 struct snd_ctl_elem_value {
         struct snd_ctl_elem_id id;      /* W: element ID */
         unsigned int indirect: 1;       /* W: indirect access - obsoleted */
-        union {
+        union {
                 union {
                         long value[128];
                         long *value_ptr;        /* obsoleted */
@@ -827,15 +827,15 @@ struct snd_ctl_elem_value {
                         unsigned char *data_ptr;        /* obsoleted */
                 } bytes;
                 struct snd_aes_iec958 iec958;
-        } value;                /* RO */
+        } value;                /* RO */
         struct timespec tstamp;
-        unsigned char reserved[128-sizeof(struct timespec)];
+        unsigned char reserved[128-sizeof(struct timespec)];
 };
 
 struct snd_ctl_tlv {
-        unsigned int numid;     /* control element numeric identification */
-        unsigned int length;    /* in bytes aligned to 4 */
-        unsigned int tlv[0];    /* first TLV */
+        unsigned int numid;     /* control element numeric identification */
+        unsigned int length;    /* in bytes aligned to 4 */
+        unsigned int tlv[0];    /* first TLV */
 };
 
 #define SNDRV_CTL_IOCTL_PVERSION        _IOR('U', 0x00, int)
@@ -886,8 +886,8 @@ struct snd_ctl_event {
                         unsigned int mask;
                         struct snd_ctl_elem_id id;
                 } elem;
-                unsigned char data8[60];
-        } data;
+                unsigned char data8[60];
+        } data;
 };
 
 /*
diff --git a/include/sound/es1688.h b/include/sound/es1688.h
index 10fcf1465810..3ec7ecbe2502 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,16 @@ 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);
+int snd_es1688_reset(struct snd_es1688 *chip);
 
 #endif /* __SOUND_ES1688_H */
diff --git a/include/sound/version.h b/include/sound/version.h
index 7fed23442db8..bf69a5b7e65f 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
 /* include/version.h */
-#define CONFIG_SND_VERSION "1.0.22.1"
+#define CONFIG_SND_VERSION "1.0.23"
 #define CONFIG_SND_DATE ""