7 files changed, 48 insertions, 30 deletions

diff --git a/include/sound/ak4113.h b/include/sound/ak4113.h
index 8988edae1609..2609048c1d44 100644
--- a/include/sound/ak4113.h
+++ b/include/sound/ak4113.h
@@ -307,7 +307,7 @@ struct ak4113 {
 
 int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,
                 ak4113_write_t *write,
-                const unsigned char pgm[AK4113_WRITABLE_REGS],
+                const unsigned char *pgm,
                 void *private_data, struct ak4113 **r_ak4113);
 void snd_ak4113_reg_write(struct ak4113 *ak4113, unsigned char reg,
                 unsigned char mask, unsigned char val);
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/info.h b/include/sound/info.h
index 112e8949e1a7..4e94cf1ff762 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -51,18 +51,18 @@ struct snd_info_entry_ops {
                     unsigned short mode, void **file_private_data);
         int (*release)(struct snd_info_entry *entry,
                        unsigned short mode, void *file_private_data);
-        long (*read)(struct snd_info_entry *entry, void *file_private_data,
-                     struct file *file, char __user *buf,
-                     unsigned long count, unsigned long pos);
-        long (*write)(struct snd_info_entry *entry, void *file_private_data,
-                      struct file *file, const char __user *buf,
-                      unsigned long count, unsigned long pos);
-        long long (*llseek)(struct snd_info_entry *entry,
-                            void *file_private_data, struct file *file,
-                            long long offset, int orig);
-        unsigned int(*poll)(struct snd_info_entry *entry,
-                            void *file_private_data, struct file *file,
-                            poll_table *wait);
+        ssize_t (*read)(struct snd_info_entry *entry, void *file_private_data,
+                        struct file *file, char __user *buf,
+                        size_t count, loff_t pos);
+        ssize_t (*write)(struct snd_info_entry *entry, void *file_private_data,
+                         struct file *file, const char __user *buf,
+                         size_t count, loff_t pos);
+        loff_t (*llseek)(struct snd_info_entry *entry,
+                         void *file_private_data, struct file *file,
+                         loff_t offset, int orig);
+        unsigned int (*poll)(struct snd_info_entry *entry,
+                             void *file_private_data, struct file *file,
+                             poll_table *wait);
         int (*ioctl)(struct snd_info_entry *entry, void *file_private_data,
                      struct file *file, unsigned int cmd, unsigned long arg);
         int (*mmap)(struct snd_info_entry *entry, void *file_private_data,
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 061f16d4c878..0a0b019d41ad 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -219,7 +219,6 @@ struct snd_soc_dai {
         struct snd_soc_codec *codec;
         unsigned int active;
         unsigned char pop_wait:1;
-        void *dma_data;
 
         /* DAI private data */
         void *private_data;
@@ -230,4 +229,21 @@ struct snd_soc_dai {
         struct list_head list;
 };
 
+static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai,
+                                             const struct snd_pcm_substream *ss)
+{
+        return (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
+                dai->playback.dma_data : dai->capture.dma_data;
+}
+
+static inline void snd_soc_dai_set_dma_data(struct snd_soc_dai *dai,
+                                            const struct snd_pcm_substream *ss,
+                                            void *data)
+{
+        if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                dai->playback.dma_data = data;
+        else
+                dai->capture.dma_data = data;
+}
+
 #endif
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 5d234a8c2506..a57fbfcd4c8f 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -375,6 +375,7 @@ struct snd_soc_pcm_stream {
         unsigned int channels_min;      /* min channels */
         unsigned int channels_max;      /* max channels */
         unsigned int active:1;          /* stream is in use */
+        void *dma_data;                 /* used by platform code */
 };
 
 /* SoC audio ops */
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 ""