76 files changed, 2759 insertions, 1431 deletions

diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl
index bd6fee22c4dd..06741e925985 100644
--- a/Documentation/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl
@@ -6164,14 +6164,12 @@ struct _snd_pcm_runtime {
 
       <para>
         The macro takes an conditional expression to evaluate.
-        When <constant>CONFIG_SND_DEBUG</constant>, is set, the
-        expression is actually evaluated. If it's non-zero, it shows
-        the warning message such as
+        When <constant>CONFIG_SND_DEBUG</constant>, is set, if the
+        expression is non-zero, it shows the warning message such as
         <computeroutput>BUG? (xxx)</computeroutput>
-        normally followed by stack trace.  It returns the evaluated
-        value.
-        When no <constant>CONFIG_SND_DEBUG</constant> is set, this
-        macro always returns zero.
+        normally followed by stack trace.
+
+        In both cases it returns the evaluated value.
       </para>
 
     </section>
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt
index d4faa63ff352..c3c912d023cc 100644
--- a/Documentation/sound/alsa/HD-Audio.txt
+++ b/Documentation/sound/alsa/HD-Audio.txt
@@ -461,11 +461,13 @@ The generic parser supports the following hints:
   the corresponding mixer control, if available
 - add_stereo_mix_input (bool): add the stereo mix (analog-loopback
   mix) to the input mux if available
-- add_out_jack_modes (bool): add "xxx Jack Mode" enum controls to each
-  output jack for allowing to change the headphone amp capability
-- add_in_jack_modes (bool): add "xxx Jack Mode" enum controls to each
-  input jack for allowing to change the mic bias vref
+- add_jack_modes (bool): add "xxx Jack Mode" enum controls to each
+  I/O jack for allowing to change the headphone amp and mic bias VREF
+  capabilities
 - power_down_unused (bool): power down the unused widgets
+- add_hp_mic (bool): add the headphone to capture source if possible
+- hp_mic_detect (bool): enable/disable the hp/mic shared input for a
+  single built-in mic case; default true
 - mixer_nid (int): specifies the widget NID of the analog-loopback
   mixer
 
diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h
index ed13053153f4..c5f2158ab00e 100644
--- a/include/linux/usb/audio-v2.h
+++ b/include/linux/usb/audio-v2.h
@@ -170,6 +170,8 @@ struct uac2_as_header_descriptor {
         __u8 iChannelNames;
 } __attribute__((packed));
 
+#define UAC2_FORMAT_TYPE_I_RAW_DATA     (1 << 31)
+
 /* 4.10.1.2 Class-Specific AS Isochronous Audio Data Endpoint Descriptor */
 
 struct uac2_iso_endpoint_descriptor {
diff --git a/include/sound/control.h b/include/sound/control.h
index 8332e865c759..34bc93d80d55 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -189,7 +189,6 @@ int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave,
  *
  * Add a virtual slave control to the given master element created via
  * snd_ctl_create_virtual_master() beforehand.
- * Returns zero if successful or a negative error code.
  *
  * All slaves must be the same type (returning the same information
  * via info callback).  The function doesn't check it, so it's your
@@ -199,6 +198,8 @@ int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave,
  * at most two channels,
  * logarithmic volume control (dB level) thus no linear volume,
  * master can only attenuate the volume without gain
+ *
+ * Return: Zero if successful or a negative error code.
  */
 static inline int
 snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave)
@@ -219,6 +220,8 @@ snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave)
  * When the control peeks the hardware values directly and the value
  * can be changed by other means than the put callback of the element,
  * this function should be used to keep the value always up-to-date.
+ *
+ * Return: Zero if successful or a negative error code.
  */
 static inline int
 snd_ctl_add_slave_uncached(struct snd_kcontrol *master,
diff --git a/include/sound/core.h b/include/sound/core.h
index 7cede2d6aa86..5bfe5136441c 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -229,7 +229,7 @@ int snd_register_device_for_dev(int type, struct snd_card *card,
  * This function uses the card's device pointer to link to the
  * correct &struct device.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 static inline int snd_register_device(int type, struct snd_card *card, int dev,
                                       const struct file_operations *f_ops,
@@ -379,18 +379,10 @@ void __snd_printk(unsigned int level, const char *file, int line,
  * snd_BUG_ON - debugging check macro
  * @cond: condition to evaluate
  *
- * When CONFIG_SND_DEBUG is set, this macro evaluates the given condition,
- * and call WARN() and returns the value if it's non-zero.
- * 
- * When CONFIG_SND_DEBUG is not set, this just returns zero, and the given
- * condition is ignored.
- *
- * NOTE: the argument won't be evaluated at all when CONFIG_SND_DEBUG=n.
- * Thus, don't put any statement that influences on the code behavior,
- * such as pre/post increment, to the argument of this macro.
- * If you want to evaluate and give a warning, use standard WARN_ON().
+ * Has the same behavior as WARN_ON when CONFIG_SND_DEBUG is set,
+ * otherwise just evaluates the conditional and returns the value.
  */
-#define snd_BUG_ON(cond)        WARN((cond), "BUG? (%s)\n", __stringify(cond))
+#define snd_BUG_ON(cond)        WARN_ON((cond))
 
 #else /* !CONFIG_SND_DEBUG */
 
@@ -400,11 +392,11 @@ __printf(2, 3)
 static inline void _snd_printd(int level, const char *format, ...) {}
 
 #define snd_BUG()                       do { } while (0)
-static inline int __snd_bug_on(int cond)
-{
-        return 0;
-}
-#define snd_BUG_ON(cond)        __snd_bug_on(0 && (cond))  /* always false */
+
+#define snd_BUG_ON(condition) ({ \
+        int __ret_warn_on = !!(condition); \
+        unlikely(__ret_warn_on); \
+})
 
 #endif /* CONFIG_SND_DEBUG */
 
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 45c1981c9ca2..aa7b0a8385cb 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -659,7 +659,7 @@ static inline snd_pcm_sframes_t snd_pcm_capture_hw_avail(struct snd_pcm_runtime
  *
  * Checks whether enough free space is available on the playback buffer.
  *
- * Returns non-zero if available, or zero if not.
+ * Return: Non-zero if available, or zero if not.
  */
 static inline int snd_pcm_playback_ready(struct snd_pcm_substream *substream)
 {
@@ -673,7 +673,7 @@ static inline int snd_pcm_playback_ready(struct snd_pcm_substream *substream)
  *
  * Checks whether enough capture data is available on the capture buffer.
  *
- * Returns non-zero if available, or zero if not.
+ * Return: Non-zero if available, or zero if not.
  */
 static inline int snd_pcm_capture_ready(struct snd_pcm_substream *substream)
 {
@@ -685,10 +685,10 @@ static inline int snd_pcm_capture_ready(struct snd_pcm_substream *substream)
  * snd_pcm_playback_data - check whether any data exists on the playback buffer
  * @substream: the pcm substream instance
  *
- * Checks whether any data exists on the playback buffer. If stop_threshold
- * is bigger or equal to boundary, then this function returns always non-zero.
+ * Checks whether any data exists on the playback buffer.
  *
- * Returns non-zero if exists, or zero if not.
+ * Return: Non-zero if any data exists, or zero if not. If stop_threshold
+ * is bigger or equal to boundary, then this function returns always non-zero.
  */
 static inline int snd_pcm_playback_data(struct snd_pcm_substream *substream)
 {
@@ -705,7 +705,7 @@ static inline int snd_pcm_playback_data(struct snd_pcm_substream *substream)
  *
  * Checks whether the playback buffer is empty.
  *
- * Returns non-zero if empty, or zero if not.
+ * Return: Non-zero if empty, or zero if not.
  */
 static inline int snd_pcm_playback_empty(struct snd_pcm_substream *substream)
 {
@@ -719,7 +719,7 @@ static inline int snd_pcm_playback_empty(struct snd_pcm_substream *substream)
  *
  * Checks whether the capture buffer is empty.
  *
- * Returns non-zero if empty, or zero if not.
+ * Return: Non-zero if empty, or zero if not.
  */
 static inline int snd_pcm_capture_empty(struct snd_pcm_substream *substream)
 {
@@ -852,7 +852,7 @@ int snd_pcm_format_big_endian(snd_pcm_format_t format);
  * snd_pcm_format_cpu_endian - Check the PCM format is CPU-endian
  * @format: the format to check
  *
- * Returns 1 if the given PCM format is CPU-endian, 0 if
+ * Return: 1 if the given PCM format is CPU-endian, 0 if
  * opposite, or a negative error code if endian not specified.
  */
 int snd_pcm_format_cpu_endian(snd_pcm_format_t format);
@@ -963,7 +963,7 @@ struct page *snd_pcm_lib_get_vmalloc_page(struct snd_pcm_substream *substream,
  * contiguous in kernel virtual space, but not in physical memory.  Use this
  * if the buffer is accessed by kernel code but not by device DMA.
  *
- * Returns 1 if the buffer was changed, 0 if not changed, or a negative error
+ * Return: 1 if the buffer was changed, 0 if not changed, or a negative error
  * code.
  */
 static int snd_pcm_lib_alloc_vmalloc_buffer
@@ -975,6 +975,9 @@ static int snd_pcm_lib_alloc_vmalloc_buffer
  *
  * This function works like snd_pcm_lib_alloc_vmalloc_buffer(), but uses
  * vmalloc_32(), i.e., the pages are allocated from 32-bit-addressable memory.
+ *
+ * Return: 1 if the buffer was changed, 0 if not changed, or a negative error
+ * code.
  */
 static int snd_pcm_lib_alloc_vmalloc_32_buffer
                         (struct snd_pcm_substream *substream, size_t size);
@@ -1070,6 +1073,8 @@ const char *snd_pcm_format_name(snd_pcm_format_t format);
 /**
  * snd_pcm_stream_str - Get a string naming the direction of a stream
  * @substream: the pcm substream instance
+ *
+ * Return: A string naming the direction of the stream.
  */
 static inline const char *snd_pcm_stream_str(struct snd_pcm_substream *substream)
 {
diff --git a/sound/core/control.c b/sound/core/control.c
index 8c7c2c9bba61..d8aa206e8bde 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -190,7 +190,7 @@ EXPORT_SYMBOL(snd_ctl_notify);
  * Allocates a new struct snd_kcontrol instance and copies the given template 
  * to the new instance. It does not copy volatile data (access).
  *
- * Returns the pointer of the new instance, or NULL on failure.
+ * Return: The pointer of the new instance, or %NULL on failure.
  */
 static struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control,
                                         unsigned int access)
@@ -224,7 +224,7 @@ static struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control,
  * template.  When the access field of ncontrol is 0, it's assumed as
  * READWRITE access. When the count field is 0, it's assumes as one.
  *
- * Returns the pointer of the newly generated instance, or NULL on failure.
+ * Return: The pointer of the newly generated instance, or %NULL on failure.
  */
 struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new *ncontrol,
                                   void *private_data)
@@ -322,9 +322,10 @@ static int snd_ctl_find_hole(struct snd_card *card, unsigned int count)
  * snd_ctl_new1() to the given card. Assigns also an unique
  * numid used for fast search.
  *
- * Returns zero if successful, or a negative error code on failure.
- *
  * It frees automatically the control which cannot be added.
+ *
+ * Return: Zero if successful, or a negative error code on failure.
+ *
  */
 int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)
 {
@@ -380,9 +381,9 @@ EXPORT_SYMBOL(snd_ctl_add);
  * and the add_on_replace flag is set, the control is added.  If the
  * control exists, it is destroyed first.
  *
- * Returns zero if successful, or a negative error code on failure.
- *
  * It frees automatically the control which cannot be added or replaced.
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_ctl_replace(struct snd_card *card, struct snd_kcontrol *kcontrol,
                     bool add_on_replace)
@@ -442,8 +443,8 @@ EXPORT_SYMBOL(snd_ctl_replace);
  * Removes the control from the card and then releases the instance.
  * You don't need to call snd_ctl_free_one(). You must be in
  * the write lock - down_write(&card->controls_rwsem).
- * 
- * Returns 0 if successful, or a negative error code on failure.
+ *
+ * Return: 0 if successful, or a negative error code on failure.
  */
 int snd_ctl_remove(struct snd_card *card, struct snd_kcontrol *kcontrol)
 {
@@ -470,8 +471,8 @@ EXPORT_SYMBOL(snd_ctl_remove);
  *
  * Finds the control instance with the given id, removes it from the
  * card list and releases it.
- * 
- * Returns 0 if successful, or a negative error code on failure.
+ *
+ * Return: 0 if successful, or a negative error code on failure.
  */
 int snd_ctl_remove_id(struct snd_card *card, struct snd_ctl_elem_id *id)
 {
@@ -498,8 +499,8 @@ EXPORT_SYMBOL(snd_ctl_remove_id);
  *
  * Finds the control instance with the given id, removes it from the
  * card list and releases it.
- * 
- * Returns 0 if successful, or a negative error code on failure.
+ *
+ * Return: 0 if successful, or a negative error code on failure.
  */
 static int snd_ctl_remove_user_ctl(struct snd_ctl_file * file,
                                    struct snd_ctl_elem_id *id)
@@ -541,7 +542,7 @@ error:
  * Finds the control instance with the given id, and activate or
  * inactivate the control together with notification, if changed.
  *
- * Returns 0 if unchanged, 1 if changed, or a negative error code on failure.
+ * Return: 0 if unchanged, 1 if changed, or a negative error code on failure.
  */
 int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id,
                         int active)
@@ -587,7 +588,7 @@ EXPORT_SYMBOL_GPL(snd_ctl_activate_id);
  * Finds the control with the old id from the card, and replaces the
  * id with the new one.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_ctl_rename_id(struct snd_card *card, struct snd_ctl_elem_id *src_id,
                       struct snd_ctl_elem_id *dst_id)
@@ -616,10 +617,11 @@ EXPORT_SYMBOL(snd_ctl_rename_id);
  *
  * Finds the control instance with the given number-id from the card.
  *
- * Returns the pointer of the instance if found, or NULL if not.
- *
  * The caller must down card->controls_rwsem before calling this function
  * (if the race condition can happen).
+ *
+ * Return: The pointer of the instance if found, or %NULL if not.
+ *
  */
 struct snd_kcontrol *snd_ctl_find_numid(struct snd_card *card, unsigned int numid)
 {
@@ -643,10 +645,11 @@ EXPORT_SYMBOL(snd_ctl_find_numid);
  *
  * Finds the control instance with the given id from the card.
  *
- * Returns the pointer of the instance if found, or NULL if not.
- *
  * The caller must down card->controls_rwsem before calling this function
  * (if the race condition can happen).
+ *
+ * Return: The pointer of the instance if found, or %NULL if not.
+ *
  */
 struct snd_kcontrol *snd_ctl_find_id(struct snd_card *card,
                                      struct snd_ctl_elem_id *id)
@@ -1710,6 +1713,8 @@ EXPORT_SYMBOL(snd_ctl_boolean_stereo_info);
  * Sets all required fields in @info to their appropriate values.
  * If the control's accessibility is not the default (readable and writable),
  * the caller has to fill @info->access.
+ *
+ * Return: Zero.
  */
 int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels,
                       unsigned int items, const char *const names[])
diff --git a/sound/core/device.c b/sound/core/device.c
index f03cb5444a5a..df88defed176 100644
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -39,7 +39,7 @@
  * The data pointer plays a role as the identifier, too, so the
  * pointer address must be unique and unchanged.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_device_new(struct snd_card *card, snd_device_type_t type,
                    void *device_data, struct snd_device_ops *ops)
@@ -73,7 +73,7 @@ EXPORT_SYMBOL(snd_device_new);
  * callbacks, dev_disconnect and dev_free, corresponding to the state.
  * Then release the device.
  *
- * Returns zero if successful, or a negative error code on failure or if the
+ * Return: Zero if successful, or a negative error code on failure or if the
  * device not found.
  */
 int snd_device_free(struct snd_card *card, void *device_data)
@@ -116,7 +116,7 @@ EXPORT_SYMBOL(snd_device_free);
  *
  * Usually called from snd_card_disconnect().
  *
- * Returns zero if successful, or a negative error code on failure or if the
+ * Return: Zero if successful, or a negative error code on failure or if the
  * device not found.
  */
 int snd_device_disconnect(struct snd_card *card, void *device_data)
@@ -151,7 +151,7 @@ int snd_device_disconnect(struct snd_card *card, void *device_data)
  * but it can be called later if any new devices are created after
  * invocation of snd_card_register().
  *
- * Returns zero if successful, or a negative error code on failure or if the
+ * Return: Zero if successful, or a negative error code on failure or if the
  * device not found.
  */
 int snd_device_register(struct snd_card *card, void *device_data)
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index 3f7f6628cf7b..d105073298cb 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -356,7 +356,7 @@ static const struct file_operations snd_hwdep_f_ops =
  * The callbacks (hwdep->ops) must be set on the returned instance
  * after this call manually by the caller.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_hwdep_new(struct snd_card *card, char *id, int device,
                   struct snd_hwdep **rhwdep)
diff --git a/sound/core/info.c b/sound/core/info.c
index 5bb97e7d325a..c9042b4d3695 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -89,7 +89,7 @@ static int resize_info_buffer(struct snd_info_buffer *buffer,
         char *nbuf;
 
         nsize = PAGE_ALIGN(nsize);
-        nbuf = krealloc(buffer->buffer, nsize, GFP_KERNEL);
+        nbuf = krealloc(buffer->buffer, nsize, GFP_KERNEL | __GFP_ZERO);
         if (! nbuf)
                 return -ENOMEM;
 
@@ -105,7 +105,7 @@ static int resize_info_buffer(struct snd_info_buffer *buffer,
  *
  * Outputs the string on the procfs buffer just like printf().
  *
- * Returns the size of output string.
+ * Return: The size of output string, or a negative error code.
  */
 int snd_iprintf(struct snd_info_buffer *buffer, const char *fmt, ...)
 {
@@ -353,7 +353,7 @@ static int snd_info_entry_open(struct inode *inode, struct file *file)
                                 goto __nomem;
                         data->rbuffer = buffer;
                         buffer->len = PAGE_SIZE;
-                        buffer->buffer = kmalloc(buffer->len, GFP_KERNEL);
+                        buffer->buffer = kzalloc(buffer->len, GFP_KERNEL);
                         if (buffer->buffer == NULL)
                                 goto __nomem;
                 }
@@ -694,32 +694,27 @@ int snd_info_card_free(struct snd_card *card)
  *
  * Reads one line from the buffer and stores the string.
  *
- * Returns zero if successful, or 1 if error or EOF.
+ * Return: Zero if successful, or 1 if error or EOF.
  */
 int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len)
 {
         int c = -1;
 
+        if (snd_BUG_ON(!buffer || !buffer->buffer))
+                return 1;
         if (len <= 0 || buffer->stop || buffer->error)
                 return 1;
-        while (--len > 0) {
+        while (!buffer->stop) {
                 c = buffer->buffer[buffer->curr++];
-                if (c == '\n') {
-                        if (buffer->curr >= buffer->size)
-                                buffer->stop = 1;
-                        break;
-                }
-                *line++ = c;
-                if (buffer->curr >= buffer->size) {
+                if (buffer->curr >= buffer->size)
                         buffer->stop = 1;
+                if (c == '\n')
                         break;
+                if (len) {
+                        len--;
+                        *line++ = c;
                 }
         }
-        while (c != '\n' && !buffer->stop) {
-                c = buffer->buffer[buffer->curr++];
-                if (buffer->curr >= buffer->size)
-                        buffer->stop = 1;
-        }
         *line = '\0';
         return 0;
 }
@@ -735,7 +730,7 @@ EXPORT_SYMBOL(snd_info_get_line);
  * Parses the original string and copy a token to the given
  * string buffer.
  *
- * Returns the updated pointer of the original string so that
+ * Return: The updated pointer of the original string so that
  * it can be used for the next call.
  */
 const char *snd_info_get_str(char *dest, const char *src, int len)
@@ -774,7 +769,7 @@ EXPORT_SYMBOL(snd_info_get_str);
  * Usually called from other functions such as
  * snd_info_create_card_entry().
  *
- * Returns the pointer of the new instance, or NULL on failure.
+ * Return: The pointer of the new instance, or %NULL on failure.
  */
 static struct snd_info_entry *snd_info_create_entry(const char *name)
 {
@@ -803,7 +798,7 @@ static struct snd_info_entry *snd_info_create_entry(const char *name)
  *
  * Creates a new info entry and assigns it to the given module.
  *
- * Returns the pointer of the new instance, or NULL on failure.
+ * Return: The pointer of the new instance, or %NULL on failure.
  */
 struct snd_info_entry *snd_info_create_module_entry(struct module * module,
                                                const char *name,
@@ -827,7 +822,7 @@ EXPORT_SYMBOL(snd_info_create_module_entry);
  *
  * Creates a new info entry and assigns it to the given card.
  *
- * Returns the pointer of the new instance, or NULL on failure.
+ * Return: The pointer of the new instance, or %NULL on failure.
  */
 struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card,
                                              const char *name,
@@ -893,7 +888,7 @@ static int snd_info_dev_register_entry(struct snd_device *device)
  * For releasing this entry, use snd_device_free() instead of
  * snd_info_free_entry(). 
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_card_proc_new(struct snd_card *card, const char *name,
                       struct snd_info_entry **entryp)
@@ -949,7 +944,7 @@ EXPORT_SYMBOL(snd_info_free_entry);
  *
  * Registers the proc info entry.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_info_register(struct snd_info_entry * entry)
 {
diff --git a/sound/core/init.c b/sound/core/init.c
index 7b012d15c2cf..6ef06400dfc8 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -144,7 +144,7 @@ static inline int init_info_for_card(struct snd_card *card)
  *  space for the driver to use freely.  The allocated struct is stored
  *  in the given card_ret pointer.
  *
- *  Returns zero if successful or a negative error code.
+ *  Return: Zero if successful or a negative error code.
  */
 int snd_card_create(int idx, const char *xid,
                     struct module *module, int extra_size,
@@ -337,7 +337,7 @@ static const struct file_operations snd_shutdown_f_ops =
  *
  *  Disconnects all APIs from the file-operations (user space).
  *
- *  Returns zero, otherwise a negative error code.
+ *  Return: Zero, otherwise a negative error code.
  *
  *  Note: The current implementation replaces all active file->f_op with special
  *        dummy file operations (they do nothing except release).
@@ -415,7 +415,7 @@ EXPORT_SYMBOL(snd_card_disconnect);
  *  devices automatically.  That is, you don't have to release the devices
  *  by yourself.
  *
- *  Returns zero. Frees all associated devices and frees the control
+ *  Return: Zero. Frees all associated devices and frees the control
  *  interface associated to given soundcard.
  */
 static int snd_card_do_free(struct snd_card *card)
@@ -677,7 +677,7 @@ static struct device_attribute card_number_attrs =
  *  external accesses.  Thus, you should call this function at the end
  *  of the initialization of the card.
  *
- *  Returns zero otherwise a negative error code if the registration failed.
+ *  Return: Zero otherwise a negative error code if the registration failed.
  */
 int snd_card_register(struct snd_card *card)
 {
@@ -849,7 +849,7 @@ int __exit snd_card_info_done(void)
  *  This function adds the component id string to the supported list.
  *  The component can be referred from the alsa-lib.
  *
- *  Returns zero otherwise a negative error code.
+ *  Return: Zero otherwise a negative error code.
  */
   
 int snd_component_add(struct snd_card *card, const char *component)
@@ -883,7 +883,7 @@ EXPORT_SYMBOL(snd_component_add);
  *  This linked-list is used to keep tracking the connection state,
  *  and to avoid the release of busy resources by hotplug.
  *
- *  Returns zero or a negative error code.
+ *  Return: zero or a negative error code.
  */
 int snd_card_file_add(struct snd_card *card, struct file *file)
 {
@@ -920,7 +920,7 @@ EXPORT_SYMBOL(snd_card_file_add);
  *  called beforehand, it processes the pending release of
  *  resources.
  *
- *  Returns zero or a negative error code.
+ *  Return: Zero or a negative error code.
  */
 int snd_card_file_remove(struct snd_card *card, struct file *file)
 {
@@ -959,6 +959,8 @@ EXPORT_SYMBOL(snd_card_file_remove);
  *
  *  Waits until the power-state is changed.
  *
+ *  Return: Zero if successful, or a negative error code.
+ *
  *  Note: the power lock must be active before call.
  */
 int snd_power_wait(struct snd_card *card, unsigned int power_state)
diff --git a/sound/core/isadma.c b/sound/core/isadma.c
index c0f1208bb7df..e2b386156a4c 100644
--- a/sound/core/isadma.c
+++ b/sound/core/isadma.c
@@ -81,7 +81,7 @@ EXPORT_SYMBOL(snd_dma_disable);
  * @dma: the dma number
  * @size: the dma transfer size
  *
- * Returns the current pointer in DMA tranfer buffer in bytes
+ * Return: The current pointer in DMA transfer buffer in bytes.
  */
 unsigned int snd_dma_pointer(unsigned long dma, unsigned int size)
 {
diff --git a/sound/core/jack.c b/sound/core/jack.c
index a06b1651fcba..b35fe7345c20 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -98,8 +98,8 @@ static int snd_jack_dev_register(struct snd_device *device)
  *
  * Creates a new jack object.
  *
- * Returns zero if successful, or a negative error code on failure.
- * On success jjack will be initialised.
+ * Return: Zero if successful, or a negative error code on failure.
+ * On success @jjack will be initialised.
  */
 int snd_jack_new(struct snd_card *card, const char *id, int type,
                  struct snd_jack **jjack)
@@ -189,6 +189,8 @@ EXPORT_SYMBOL(snd_jack_set_parent);
  * using this abstraction.
  *
  * This function may only be called prior to registration of the jack.
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,
                      int keytype)
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 691569238435..bdf826f4fe0c 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -81,7 +81,7 @@ static inline void dec_snd_pages(int order)
  *
  * Allocates the physically contiguous pages with the given size.
  *
- * Returns the pointer of the buffer, or NULL if no enoguh memory.
+ * Return: The pointer of the buffer, or %NULL if no enough memory.
  */
 void *snd_malloc_pages(size_t size, gfp_t gfp_flags)
 {
@@ -175,9 +175,9 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,
  *
  * Calls the memory-allocator function for the corresponding
  * buffer type.
- * 
- * Returns zero if the buffer with the given size is allocated successfully,
- * other a negative value at error.
+ *
+ * Return: Zero if the buffer with the given size is allocated successfully,
+ * otherwise a negative value on error.
  */
 int snd_dma_alloc_pages(int type, struct device *device, size_t size,
                         struct snd_dma_buffer *dmab)
@@ -229,9 +229,9 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
  * buffer type.  When no space is left, this function reduces the size and
  * tries to allocate again.  The size actually allocated is stored in
  * res_size argument.
- * 
- * Returns zero if the buffer with the given size is allocated successfully,
- * other a negative value at error.
+ *
+ * Return: Zero if the buffer with the given size is allocated successfully,
+ * otherwise a negative value on error.
  */
 int snd_dma_alloc_pages_fallback(int type, struct device *device, size_t size,
                                  struct snd_dma_buffer *dmab)
@@ -292,7 +292,7 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)
  * Looks for the reserved-buffer list and re-uses if the same buffer
  * is found in the list.  When the buffer is found, it's removed from the free list.
  *
- * Returns the size of buffer if the buffer is found, or zero if not found.
+ * Return: The size of buffer if the buffer is found, or zero if not found.
  */
 size_t snd_dma_get_reserved_buf(struct snd_dma_buffer *dmab, unsigned int id)
 {
@@ -326,8 +326,8 @@ size_t snd_dma_get_reserved_buf(struct snd_dma_buffer *dmab, unsigned int id)
  * @id: the buffer id
  *
  * Reserves the given buffer as a reserved buffer.
- * 
- * Returns zero if successful, or a negative code at error.
+ *
+ * Return: Zero if successful, or a negative code on error.
  */
 int snd_dma_reserve_buf(struct snd_dma_buffer *dmab, unsigned int id)
 {
diff --git a/sound/core/memory.c b/sound/core/memory.c
index 66a278d0b04e..36c0f1a2e189 100644
--- a/sound/core/memory.c
+++ b/sound/core/memory.c
@@ -33,7 +33,7 @@
  *
  * Copies the data from mmio-space to user-space.
  *
- * Returns zero if successful, or non-zero on failure.
+ * Return: Zero if successful, or non-zero on failure.
  */
 int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count)
 {
@@ -66,7 +66,7 @@ EXPORT_SYMBOL(copy_to_user_fromio);
  *
  * Copies the data from user-space to mmio-space.
  *
- * Returns zero if successful, or non-zero on failure.
+ * Return: Zero if successful, or non-zero on failure.
  */
 int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count)
 {
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 61798f85d030..578327e2bc26 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -637,7 +637,7 @@ static inline int snd_pcm_substream_proc_done(struct snd_pcm_substream *substrea
  * calling this, i.e. zero must be given to the argument of
  * snd_pcm_new().
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)
 {
@@ -759,7 +759,7 @@ static int _snd_pcm_new(struct snd_card *card, const char *id, int device,
  * The pcm operators have to be set afterwards to the new instance
  * via snd_pcm_set_ops().
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_new(struct snd_card *card, const char *id, int device,
                 int playback_count, int capture_count, struct snd_pcm **rpcm)
@@ -787,7 +787,7 @@ EXPORT_SYMBOL(snd_pcm_new);
  * The pcm operators have to be set afterwards to the new instance
  * via snd_pcm_set_ops().
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_new_internal(struct snd_card *card, const char *id, int device,
         int playback_count, int capture_count,
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index c4840ff75d00..41b3dfe68698 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -666,7 +666,8 @@ static inline unsigned int muldiv32(unsigned int a, unsigned int b,
  * The interval is changed to the range satisfying both intervals.
  * The interval status (min, max, integer, etc.) are evaluated.
  *
- * Returns non-zero if the value is changed, zero if not changed.
+ * Return: Positive if the value is changed, zero if it's not changed, or a
+ * negative error code.
  */
 int snd_interval_refine(struct snd_interval *i, const struct snd_interval *v)
 {
@@ -865,7 +866,8 @@ void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k,
  * @nump: pointer to store the resultant numerator
  * @denp: pointer to store the resultant denominator
  *
- * Returns non-zero if the value is changed, zero if not changed.
+ * Return: Positive if the value is changed, zero if it's not changed, or a
+ * negative error code.
  */
 int snd_interval_ratnum(struct snd_interval *i,
                         unsigned int rats_count, struct snd_ratnum *rats,
@@ -983,7 +985,8 @@ EXPORT_SYMBOL(snd_interval_ratnum);
  * @nump: pointer to store the resultant numerator
  * @denp: pointer to store the resultant denominator
  *
- * Returns non-zero if the value is changed, zero if not changed.
+ * Return: Positive if the value is changed, zero if it's not changed, or a
+ * negative error code.
  */
 static int snd_interval_ratden(struct snd_interval *i,
                                unsigned int rats_count, struct snd_ratden *rats,
@@ -1082,7 +1085,8 @@ static int snd_interval_ratden(struct snd_interval *i,
  * When mask is non-zero, only the elements corresponding to bit 1 are
  * evaluated.
  *
- * Returns non-zero if the value is changed, zero if not changed.
+ * Return: Positive if the value is changed, zero if it's not changed, or a
+ * negative error code.
  */
 int snd_interval_list(struct snd_interval *i, unsigned int count,
                       const unsigned int *list, unsigned int mask)
@@ -1142,7 +1146,7 @@ static int snd_interval_step(struct snd_interval *i, unsigned int min, unsigned
  * @private: the private data pointer passed to function
  * @dep: the dependent variables
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,
                         int var,
@@ -1200,6 +1204,8 @@ EXPORT_SYMBOL(snd_pcm_hw_rule_add);
  * @mask: the bitmap mask
  *
  * Apply the constraint of the given bitmap mask to a 32-bit mask parameter.
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
                                u_int32_t mask)
@@ -1220,6 +1226,8 @@ int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime, snd_pcm_hw_param
  * @mask: the 64bit bitmap mask
  *
  * Apply the constraint of the given bitmap mask to a 64-bit mask parameter.
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
                                  u_int64_t mask)
@@ -1240,6 +1248,9 @@ int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_par
  * @var: hw_params variable to apply the integer constraint
  *
  * Apply the constraint of integer to an interval parameter.
+ *
+ * Return: Positive if the value is changed, zero if it's not changed, or a
+ * negative error code.
  */
 int snd_pcm_hw_constraint_integer(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var)
 {
@@ -1257,6 +1268,9 @@ EXPORT_SYMBOL(snd_pcm_hw_constraint_integer);
  * @max: the maximal value
  * 
  * Apply the min/max range constraint to an interval parameter.
+ *
+ * Return: Positive if the value is changed, zero if it's not changed, or a
+ * negative error code.
  */
 int snd_pcm_hw_constraint_minmax(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var,
                                  unsigned int min, unsigned int max)
@@ -1288,6 +1302,8 @@ static int snd_pcm_hw_rule_list(struct snd_pcm_hw_params *params,
  * @l: list
  * 
  * Apply the list of constraints to an interval parameter.
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime,
                                unsigned int cond,
@@ -1322,6 +1338,8 @@ static int snd_pcm_hw_rule_ratnums(struct snd_pcm_hw_params *params,
  * @cond: condition bits
  * @var: hw_params variable to apply the ratnums constraint
  * @r: struct snd_ratnums constriants
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime, 
                                   unsigned int cond,
@@ -1355,6 +1373,8 @@ static int snd_pcm_hw_rule_ratdens(struct snd_pcm_hw_params *params,
  * @cond: condition bits
  * @var: hw_params variable to apply the ratdens constraint
  * @r: struct snd_ratdens constriants
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_hw_constraint_ratdens(struct snd_pcm_runtime *runtime, 
                                   unsigned int cond,
@@ -1386,6 +1406,8 @@ static int snd_pcm_hw_rule_msbits(struct snd_pcm_hw_params *params,
  * @cond: condition bits
  * @width: sample bits width
  * @msbits: msbits width
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_hw_constraint_msbits(struct snd_pcm_runtime *runtime, 
                                  unsigned int cond,
@@ -1414,6 +1436,8 @@ static int snd_pcm_hw_rule_step(struct snd_pcm_hw_params *params,
  * @cond: condition bits
  * @var: hw_params variable to apply the step constraint
  * @step: step size
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_hw_constraint_step(struct snd_pcm_runtime *runtime,
                                unsigned int cond,
@@ -1444,6 +1468,8 @@ static int snd_pcm_hw_rule_pow2(struct snd_pcm_hw_params *params, struct snd_pcm
  * @runtime: PCM runtime instance
  * @cond: condition bits
  * @var: hw_params variable to apply the power-of-2 constraint
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_hw_constraint_pow2(struct snd_pcm_runtime *runtime,
                                unsigned int cond,
@@ -1470,6 +1496,8 @@ static int snd_pcm_hw_rule_noresample_func(struct snd_pcm_hw_params *params,
  * snd_pcm_hw_rule_noresample - add a rule to allow disabling hw resampling
  * @runtime: PCM runtime instance
  * @base_rate: the rate at which the hardware does not resample
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_hw_rule_noresample(struct snd_pcm_runtime *runtime,
                                unsigned int base_rate)
@@ -1519,8 +1547,8 @@ EXPORT_SYMBOL(_snd_pcm_hw_params_any);
  * @var: parameter to retrieve
  * @dir: pointer to the direction (-1,0,1) or %NULL
  *
- * Return the value for field @var if it's fixed in configuration space
- * defined by @params. Return -%EINVAL otherwise.
+ * Return: The value for field @var if it's fixed in configuration space
+ * defined by @params. -%EINVAL otherwise.
  */
 int snd_pcm_hw_param_value(const struct snd_pcm_hw_params *params,
                            snd_pcm_hw_param_t var, int *dir)
@@ -1591,7 +1619,8 @@ static int _snd_pcm_hw_param_first(struct snd_pcm_hw_params *params,
  *
  * Inside configuration space defined by @params remove from @var all
  * values > minimum. Reduce configuration space accordingly.
- * Return the minimum.
+ *
+ * Return: The minimum, or a negative error code on failure.
  */
 int snd_pcm_hw_param_first(struct snd_pcm_substream *pcm, 
                            struct snd_pcm_hw_params *params, 
@@ -1637,7 +1666,8 @@ static int _snd_pcm_hw_param_last(struct snd_pcm_hw_params *params,
  *
  * Inside configuration space defined by @params remove from @var all
  * values < maximum. Reduce configuration space accordingly.
- * Return the maximum.
+ *
+ * Return: The maximum, or a negative error code on failure.
  */
 int snd_pcm_hw_param_last(struct snd_pcm_substream *pcm, 
                           struct snd_pcm_hw_params *params,
@@ -1665,6 +1695,8 @@ EXPORT_SYMBOL(snd_pcm_hw_param_last);
  * The configuration chosen is that obtained fixing in this order:
  * first access, first format, first subformat, min channels,
  * min rate, min period time, max buffer size, min tick time
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_hw_params_choose(struct snd_pcm_substream *pcm,
                              struct snd_pcm_hw_params *params)
@@ -1771,7 +1803,7 @@ static int snd_pcm_lib_ioctl_fifo_size(struct snd_pcm_substream *substream,
  * Processes the generic ioctl commands for PCM.
  * Can be passed as the ioctl callback for PCM ops.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream,
                       unsigned int cmd, void *arg)
@@ -2510,7 +2542,7 @@ static void pcm_chmap_ctl_private_free(struct snd_kcontrol *kcontrol)
  * @info_ret: store struct snd_pcm_chmap instance if non-NULL
  *
  * Create channel-mapping control elements assigned to the given PCM stream(s).
- * Returns zero if succeed, or a negative error value.
+ * Return: Zero if successful, or a negative error value.
  */
 int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream,
                            const struct snd_pcm_chmap_elem *chmap,
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c
index 69e01c4fc32d..0af622c34e19 100644
--- a/sound/core/pcm_memory.c
+++ b/sound/core/pcm_memory.c
@@ -95,7 +95,7 @@ static void snd_pcm_lib_preallocate_dma_free(struct snd_pcm_substream *substream
  *
  * Releases the pre-allocated buffer of the given substream.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_lib_preallocate_free(struct snd_pcm_substream *substream)
 {
@@ -115,7 +115,7 @@ int snd_pcm_lib_preallocate_free(struct snd_pcm_substream *substream)
  *
  * Releases all the pre-allocated buffers on the given pcm.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_lib_preallocate_free_for_all(struct snd_pcm *pcm)
 {
@@ -265,7 +265,7 @@ static int snd_pcm_lib_preallocate_pages1(struct snd_pcm_substream *substream,
  * destruction time.  The dma_buf_id must be unique for all systems
  * (in the same DMA buffer type) e.g. using snd_dma_pci_buf_id().
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_lib_preallocate_pages(struct snd_pcm_substream *substream,
                                   int type, struct device *data,
@@ -289,7 +289,7 @@ EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages);
  * Do pre-allocation to all substreams of the given pcm for the
  * specified DMA type.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_lib_preallocate_pages_for_all(struct snd_pcm *pcm,
                                           int type, void *data,
@@ -313,8 +313,9 @@ EXPORT_SYMBOL(snd_pcm_lib_preallocate_pages_for_all);
  * @substream: the pcm substream instance
  * @offset: the buffer offset
  *
- * Returns the page struct at the given buffer offset.
  * Used as the page callback of PCM ops.
+ *
+ * Return: The page struct at the given buffer offset. %NULL on failure.
  */
 struct page *snd_pcm_sgbuf_ops_page(struct snd_pcm_substream *substream, unsigned long offset)
 {
@@ -337,7 +338,7 @@ EXPORT_SYMBOL(snd_pcm_sgbuf_ops_page);
  * Allocates the DMA buffer on the BUS type given earlier to
  * snd_pcm_lib_preallocate_xxx_pages().
  *
- * Returns 1 if the buffer is changed, 0 if not changed, or a negative
+ * Return: 1 if the buffer is changed, 0 if not changed, or a negative
  * code on failure.
  */
 int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t size)
@@ -390,7 +391,7 @@ EXPORT_SYMBOL(snd_pcm_lib_malloc_pages);
  *
  * Releases the DMA buffer allocated via snd_pcm_lib_malloc_pages().
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream)
 {
@@ -437,6 +438,8 @@ EXPORT_SYMBOL(_snd_pcm_lib_alloc_vmalloc_buffer);
  * snd_pcm_lib_free_vmalloc_buffer - free vmalloc buffer
  * @substream: the substream with a buffer allocated by
  *      snd_pcm_lib_alloc_vmalloc_buffer()
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_lib_free_vmalloc_buffer(struct snd_pcm_substream *substream)
 {
@@ -458,6 +461,8 @@ EXPORT_SYMBOL(snd_pcm_lib_free_vmalloc_buffer);
  * @offset: offset in the buffer
  *
  * This function is to be used as the page callback in the PCM ops.
+ *
+ * Return: The page struct, or %NULL on failure.
  */
 struct page *snd_pcm_lib_get_vmalloc_page(struct snd_pcm_substream *substream,
                                           unsigned long offset)
diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
index d4fc1bfbe457..b875b19f2d55 100644
--- a/sound/core/pcm_misc.c
+++ b/sound/core/pcm_misc.c
@@ -213,7 +213,7 @@ static struct pcm_format_data pcm_formats[(INT)SNDRV_PCM_FORMAT_LAST+1] = {
  * snd_pcm_format_signed - Check the PCM format is signed linear
  * @format: the format to check
  *
- * Returns 1 if the given PCM format is signed linear, 0 if unsigned
+ * Return: 1 if the given PCM format is signed linear, 0 if unsigned
  * linear, and a negative error code for non-linear formats.
  */
 int snd_pcm_format_signed(snd_pcm_format_t format)
@@ -232,7 +232,7 @@ EXPORT_SYMBOL(snd_pcm_format_signed);
  * snd_pcm_format_unsigned - Check the PCM format is unsigned linear
  * @format: the format to check
  *
- * Returns 1 if the given PCM format is unsigned linear, 0 if signed
+ * Return: 1 if the given PCM format is unsigned linear, 0 if signed
  * linear, and a negative error code for non-linear formats.
  */
 int snd_pcm_format_unsigned(snd_pcm_format_t format)
@@ -251,7 +251,7 @@ EXPORT_SYMBOL(snd_pcm_format_unsigned);
  * snd_pcm_format_linear - Check the PCM format is linear
  * @format: the format to check
  *
- * Returns 1 if the given PCM format is linear, 0 if not.
+ * Return: 1 if the given PCM format is linear, 0 if not.
  */
 int snd_pcm_format_linear(snd_pcm_format_t format)
 {
@@ -264,7 +264,7 @@ EXPORT_SYMBOL(snd_pcm_format_linear);
  * snd_pcm_format_little_endian - Check the PCM format is little-endian
  * @format: the format to check
  *
- * Returns 1 if the given PCM format is little-endian, 0 if
+ * Return: 1 if the given PCM format is little-endian, 0 if
  * big-endian, or a negative error code if endian not specified.
  */
 int snd_pcm_format_little_endian(snd_pcm_format_t format)
@@ -283,7 +283,7 @@ EXPORT_SYMBOL(snd_pcm_format_little_endian);
  * snd_pcm_format_big_endian - Check the PCM format is big-endian
  * @format: the format to check
  *
- * Returns 1 if the given PCM format is big-endian, 0 if
+ * Return: 1 if the given PCM format is big-endian, 0 if
  * little-endian, or a negative error code if endian not specified.
  */
 int snd_pcm_format_big_endian(snd_pcm_format_t format)
@@ -302,7 +302,7 @@ EXPORT_SYMBOL(snd_pcm_format_big_endian);
  * snd_pcm_format_width - return the bit-width of the format
  * @format: the format to check
  *
- * Returns the bit-width of the format, or a negative error code
+ * Return: The bit-width of the format, or a negative error code
  * if unknown format.
  */
 int snd_pcm_format_width(snd_pcm_format_t format)
@@ -321,7 +321,7 @@ EXPORT_SYMBOL(snd_pcm_format_width);
  * snd_pcm_format_physical_width - return the physical bit-width of the format
  * @format: the format to check
  *
- * Returns the physical bit-width of the format, or a negative error code
+ * Return: The physical bit-width of the format, or a negative error code
  * if unknown format.
  */
 int snd_pcm_format_physical_width(snd_pcm_format_t format)
@@ -341,7 +341,7 @@ EXPORT_SYMBOL(snd_pcm_format_physical_width);
  * @format: the format to check
  * @samples: sampling rate
  *
- * Returns the byte size of the given samples for the format, or a
+ * Return: The byte size of the given samples for the format, or a
  * negative error code if unknown format.
  */
 ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples)
@@ -358,7 +358,7 @@ EXPORT_SYMBOL(snd_pcm_format_size);
  * snd_pcm_format_silence_64 - return the silent data in 8 bytes array
  * @format: the format to check
  *
- * Returns the format pattern to fill or NULL if error.
+ * Return: The format pattern to fill or %NULL if error.
  */
 const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format)
 {
@@ -379,7 +379,7 @@ EXPORT_SYMBOL(snd_pcm_format_silence_64);
  *
  * Sets the silence data on the buffer for the given samples.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int samples)
 {
@@ -449,7 +449,7 @@ EXPORT_SYMBOL(snd_pcm_format_set_silence);
  * Determines the rate_min and rate_max fields from the rates bits of
  * the given runtime->hw.
  *
- * Returns zero if successful.
+ * Return: Zero if successful.
  */
 int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime)
 {
@@ -475,7 +475,7 @@ EXPORT_SYMBOL(snd_pcm_limit_hw_rates);
  * snd_pcm_rate_to_rate_bit - converts sample rate to SNDRV_PCM_RATE_xxx bit
  * @rate: the sample rate to convert
  *
- * Returns the SNDRV_PCM_RATE_xxx flag that corresponds to the given rate, or
+ * Return: The SNDRV_PCM_RATE_xxx flag that corresponds to the given rate, or
  * SNDRV_PCM_RATE_KNOT for an unknown rate.
  */
 unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate)
@@ -493,8 +493,8 @@ EXPORT_SYMBOL(snd_pcm_rate_to_rate_bit);
  * snd_pcm_rate_bit_to_rate - converts SNDRV_PCM_RATE_xxx bit to sample rate
  * @rate_bit: the rate bit to convert
  *
- * Returns the sample rate that corresponds to the given SNDRV_PCM_RATE_xxx flag
- * or 0 for an unknown rate bit
+ * Return: The sample rate that corresponds to the given SNDRV_PCM_RATE_xxx flag
+ * or 0 for an unknown rate bit.
  */
 unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit)
 {
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 71ae86ca64ac..5bce9152b64e 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -898,6 +898,8 @@ static struct action_ops snd_pcm_action_start = {
 /**
  * snd_pcm_start - start all linked streams
  * @substream: the PCM substream instance
+ *
+ * Return: Zero if successful, or a negative error code.
  */
 int snd_pcm_start(struct snd_pcm_substream *substream)
 {
@@ -951,6 +953,8 @@ static struct action_ops snd_pcm_action_stop = {
  * @state: PCM state after stopping the stream
  *
  * The state of each stream is then changed to the given state unconditionally.
+ *
+ * Return: Zero if succesful, or a negative error code.
  */
 int snd_pcm_stop(struct snd_pcm_substream *substream, snd_pcm_state_t state)
 {
@@ -965,6 +969,8 @@ EXPORT_SYMBOL(snd_pcm_stop);
  *
  * After stopping, the state is changed to SETUP.
  * Unlike snd_pcm_stop(), this affects only the given stream.
+ *
+ * Return: Zero if succesful, or a negative error code.
  */
 int snd_pcm_drain_done(struct snd_pcm_substream *substream)
 {
@@ -1098,6 +1104,9 @@ static struct action_ops snd_pcm_action_suspend = {
  * @substream: the PCM substream
  *
  * After this call, all streams are changed to SUSPENDED state.
+ *
+ * Return: Zero if successful (or @substream is %NULL), or a negative error
+ * code.
  */
 int snd_pcm_suspend(struct snd_pcm_substream *substream)
 {
@@ -1120,6 +1129,8 @@ EXPORT_SYMBOL(snd_pcm_suspend);
  * @pcm: the PCM instance
  *
  * After this call, all streams are changed to SUSPENDED state.
+ *
+ * Return: Zero if successful (or @pcm is %NULL), or a negative error code.
  */
 int snd_pcm_suspend_all(struct snd_pcm *pcm)
 {
@@ -1343,6 +1354,8 @@ static struct action_ops snd_pcm_action_prepare = {
  * snd_pcm_prepare - prepare the PCM substream to be triggerable
  * @substream: the PCM substream instance
  * @file: file to refer f_flags
+ *
+ * Return: Zero if successful, or a negative error code.
  */
 static int snd_pcm_prepare(struct snd_pcm_substream *substream,
                            struct file *file)
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index 1bb95aeea084..7b596b5751db 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -863,7 +863,7 @@ static int snd_rawmidi_control_ioctl(struct snd_card *card,
  *
  * Reads the data from the internal buffer.
  *
- * Returns the size of read data, or a negative error code on failure.
+ * Return: The size of read data, or a negative error code on failure.
  */
 int snd_rawmidi_receive(struct snd_rawmidi_substream *substream,
                         const unsigned char *buffer, int count)
@@ -1024,8 +1024,8 @@ static ssize_t snd_rawmidi_read(struct file *file, char __user *buf, size_t coun
 /**
  * snd_rawmidi_transmit_empty - check whether the output buffer is empty
  * @substream: the rawmidi substream
- * 
- * Returns 1 if the internal output buffer is empty, 0 if not.
+ *
+ * Return: 1 if the internal output buffer is empty, 0 if not.
  */
 int snd_rawmidi_transmit_empty(struct snd_rawmidi_substream *substream)
 {
@@ -1055,7 +1055,7 @@ int snd_rawmidi_transmit_empty(struct snd_rawmidi_substream *substream)
  * and call snd_rawmidi_transmit_ack() after the transmission is
  * finished.
  *
- * Returns the size of copied data, or a negative error code on failure.
+ * Return: The size of copied data, or a negative error code on failure.
  */
 int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream,
                               unsigned char *buffer, int count)
@@ -1107,7 +1107,7 @@ int snd_rawmidi_transmit_peek(struct snd_rawmidi_substream *substream,
  * the given size and updates the condition.
  * Call after the transmission is finished.
  *
- * Returns the advanced size if successful, or a negative error code on failure.
+ * Return: The advanced size if successful, or a negative error code on failure.
  */
 int snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count)
 {
@@ -1140,7 +1140,7 @@ int snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count)
  * 
  * Copies data from the buffer to the device and advances the pointer.
  *
- * Returns the copied size if successful, or a negative error code on failure.
+ * Return: The copied size if successful, or a negative error code on failure.
  */
 int snd_rawmidi_transmit(struct snd_rawmidi_substream *substream,
                          unsigned char *buffer, int count)
@@ -1438,7 +1438,7 @@ static int snd_rawmidi_alloc_substreams(struct snd_rawmidi *rmidi,
  * Creates a new rawmidi instance.
  * Use snd_rawmidi_set_ops() to set the operators to the new instance.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_rawmidi_new(struct snd_card *card, char *id, int device,
                     int output_count, int input_count,
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 70ccdab74153..f002bd911dae 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -102,6 +102,9 @@ static void snd_request_other(int minor)
  * This function increments the reference counter of the card instance
  * if an associated instance with the given minor number and type is found.
  * The caller must call snd_card_unref() appropriately later.
+ *
+ * Return: The user data pointer if the specified device is found. %NULL
+ * otherwise.
  */
 void *snd_lookup_minor_data(unsigned int minor, int type)
 {
@@ -261,7 +264,7 @@ static int snd_kernel_minor(int type, struct snd_card *card, int dev)
  * Registers an ALSA device file for the given card.
  * The operators have to be set in reg parameter.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
                                 const struct file_operations *f_ops,
@@ -339,7 +342,7 @@ static int find_snd_minor(int type, struct snd_card *card, int dev)
  * Unregisters the device file already registered via
  * snd_register_device().
  *
- * Returns zero if sucecessful, or a negative error code on failure
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_unregister_device(int type, struct snd_card *card, int dev)
 {
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
index 0097f3619faa..02f90b4f8b86 100644
--- a/sound/core/vmaster.c
+++ b/sound/core/vmaster.c
@@ -365,8 +365,7 @@ static void master_free(struct snd_kcontrol *kcontrol)
  * @name: name string of the control element to create
  * @tlv: optional TLV int array for dB information
  *
- * Creates a virtual matster control with the given name string.
- * Returns the created control element, or NULL for errors (ENOMEM).
+ * Creates a virtual master control with the given name string.
  *
  * After creating a vmaster element, you can add the slave controls
  * via snd_ctl_add_slave() or snd_ctl_add_slave_uncached().
@@ -375,6 +374,8 @@ static void master_free(struct snd_kcontrol *kcontrol)
  * for dB scale of the master control.  It should be a single element
  * with #SNDRV_CTL_TLVT_DB_SCALE, #SNDRV_CTL_TLV_DB_MINMAX or
  * #SNDRV_CTL_TLVT_DB_MINMAX_MUTE type, and should be the max 0dB.
+ *
+ * Return: The created control element, or %NULL for errors (ENOMEM).
  */
 struct snd_kcontrol *snd_ctl_make_virtual_master(char *name,
                                                  const unsigned int *tlv)
@@ -426,6 +427,8 @@ EXPORT_SYMBOL(snd_ctl_make_virtual_master);
  *
  * Adds the given hook to the vmaster control element so that it's called
  * at each time when the value is changed.
+ *
+ * Return: Zero.
  */
 int snd_ctl_add_vmaster_hook(struct snd_kcontrol *kcontrol,
                              void (*hook)(void *private_data, int),
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c
index 4608c2ca43f8..e3a90d043f03 100644
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
@@ -129,6 +129,8 @@ static void _snd_mpu401_uart_interrupt(struct snd_mpu401 *mpu)
  * @dev_id: mpu401 instance
  *
  * Processes the interrupt for MPU401-UART i/o.
+ *
+ * Return: %IRQ_HANDLED if the interrupt was handled. %IRQ_NONE otherwise.
  */
 irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id)
 {
@@ -148,6 +150,8 @@ EXPORT_SYMBOL(snd_mpu401_uart_interrupt);
  * @dev_id: mpu401 instance
  *
  * Processes the interrupt for MPU401-UART output.
+ *
+ * Return: %IRQ_HANDLED if the interrupt was handled. %IRQ_NONE otherwise.
  */
 irqreturn_t snd_mpu401_uart_interrupt_tx(int irq, void *dev_id)
 {
@@ -519,7 +523,7 @@ static void snd_mpu401_uart_free(struct snd_rawmidi *rmidi)
  * not the mpu401 instance itself.  To access to the mpu401 instance,
  * cast from rawmidi->private_data (with struct snd_mpu401 magic-cast).
  *
- * Returns zero if successful, or a negative error code.
+ * Return: Zero if successful, or a negative error code.
  */
 int snd_mpu401_uart_new(struct snd_card *card, int device,
                         unsigned short hardware,
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index 7d42c5418d1b..851a1da46be1 100644
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -626,13 +626,12 @@ int sb_dsp_detect(struct address_info *hw_config, int pci, int pciio, struct sb_
          */
 
 
-        detected_devc = kmalloc(sizeof(sb_devc), GFP_KERNEL);
+        detected_devc = kmemdup(devc, sizeof(sb_devc), GFP_KERNEL);
         if (detected_devc == NULL)
         {
                 printk(KERN_ERR "sb: Can't allocate memory for device information\n");
                 return 0;
         }
-        memcpy(detected_devc, devc, sizeof(sb_devc));
         MDB(printk(KERN_INFO "SB %d.%02d detected OK (%x)\n", devc->major, devc->minor, hw_config->io_base));
         return 1;
 }
diff --git a/sound/oss/uart401.c b/sound/oss/uart401.c
index 8e514a676a0d..5433c6f5eca2 100644
--- a/sound/oss/uart401.c
+++ b/sound/oss/uart401.c
@@ -352,23 +352,26 @@ int probe_uart401(struct address_info *hw_config, struct module *owner)
                 goto cleanup_irq;
         }
         conf_printf(name, hw_config);
-        midi_devs[devc->my_dev] = kmalloc(sizeof(struct midi_operations), GFP_KERNEL);
+        midi_devs[devc->my_dev] = kmemdup(&uart401_operations,
+                                          sizeof(struct midi_operations),
+                                          GFP_KERNEL);
         if (!midi_devs[devc->my_dev]) {
                 printk(KERN_ERR "uart401: Failed to allocate memory\n");
                 goto cleanup_unload_mididev;
         }
-        memcpy(midi_devs[devc->my_dev], &uart401_operations, sizeof(struct midi_operations));
 
         if (owner)
                 midi_devs[devc->my_dev]->owner = owner;
         
         midi_devs[devc->my_dev]->devc = devc;
-        midi_devs[devc->my_dev]->converter = kmalloc(sizeof(struct synth_operations), GFP_KERNEL);
+        midi_devs[devc->my_dev]->converter = kmemdup(&std_midi_synth,
+                                                     sizeof(struct synth_operations),
+                                                     GFP_KERNEL);
+
         if (!midi_devs[devc->my_dev]->converter) {
                 printk(KERN_WARNING "uart401: Failed to allocate memory\n");
                 goto cleanup_midi_devs;
         }
-        memcpy(midi_devs[devc->my_dev]->converter, &std_midi_synth, sizeof(struct synth_operations));
         strcpy(midi_devs[devc->my_dev]->info.name, name);
         midi_devs[devc->my_dev]->converter->id = "UART401";
         midi_devs[devc->my_dev]->converter->midi_dev = devc->my_dev;
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 8b0f99688303..d37c683cfd7a 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -299,7 +299,7 @@ EXPORT_SYMBOL(snd_ac97_write);
  * Reads a value from the given register.  This will invoke the read
  * callback directly after the register check.
  *
- * Returns the read value.
+ * Return: The read value.
  */
 unsigned short snd_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
 {
@@ -352,7 +352,7 @@ EXPORT_SYMBOL(snd_ac97_write_cache);
  * Compares the value with the register cache and updates the value
  * only when the value is changed.
  *
- * Returns 1 if the value is changed, 0 if no change, or a negative
+ * Return: 1 if the value is changed, 0 if no change, or a negative
  * code on failure.
  */
 int snd_ac97_update(struct snd_ac97 *ac97, unsigned short reg, unsigned short value)
@@ -384,7 +384,7 @@ EXPORT_SYMBOL(snd_ac97_update);
  * Updates the masked-bits on the given register only when the value
  * is changed.
  *
- * Returns 1 if the bits are changed, 0 if no change, or a negative
+ * Return: 1 if the bits are changed, 0 if no change, or a negative
  * code on failure.
  */
 int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned short mask, unsigned short value)
@@ -1836,7 +1836,7 @@ void snd_ac97_get_name(struct snd_ac97 *ac97, unsigned int id, char *name, int m
  * snd_ac97_get_short_name - retrieve codec name
  * @ac97: the codec instance
  *
- * Returns the short identifying name of the codec.
+ * Return: The short identifying name of the codec.
  */
 const char *snd_ac97_get_short_name(struct snd_ac97 *ac97)
 {
@@ -1910,7 +1910,7 @@ static int ac97_reset_wait(struct snd_ac97 *ac97, int timeout, int with_modem)
  * The AC97 bus instance is registered as a low-level device, so you don't
  * have to release it manually.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_ac97_bus(struct snd_card *card, int num, struct snd_ac97_bus_ops *ops,
                  void *private_data, struct snd_ac97_bus **rbus)
@@ -2006,7 +2006,7 @@ static void do_update_power(struct work_struct *work)
  * The ac97 instance is registered as a low-level device, so you don't
  * have to release it manually.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, struct snd_ac97 **rac97)
 {
@@ -2373,6 +2373,8 @@ static struct ac97_power_reg power_regs[PWIDX_SIZE] = {
  * @powerup: non-zero when power up the part
  *
  * Update the AC97 powerdown register bits of the given part.
+ *
+ * Return: Zero.
  */
 int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, int powerup)
 {
@@ -2885,7 +2887,7 @@ static int apply_quirk_str(struct snd_ac97 *ac97, const char *typestr)
  * headphone (true line-out) control as "Master".
  * The quirk-list must be terminated with a zero-filled entry.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 
 int snd_ac97_tune_hardware(struct snd_ac97 *ac97, struct ac97_quirk *quirk, const char *override)
diff --git a/sound/pci/ac97/ac97_pcm.c b/sound/pci/ac97/ac97_pcm.c
index f1488fc176d5..eab0fc9ff2e0 100644
--- a/sound/pci/ac97/ac97_pcm.c
+++ b/sound/pci/ac97/ac97_pcm.c
@@ -253,7 +253,7 @@ static int set_spdif_rate(struct snd_ac97 *ac97, unsigned short rate)
  * AC97_SPDIF is accepted as a pseudo register to modify the SPDIF
  * status bits.
  *
- * Returns zero if successful, or a negative error code on failure.
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_ac97_set_rate(struct snd_ac97 *ac97, int reg, unsigned int rate)
 {
@@ -440,6 +440,8 @@ static unsigned int get_rates(struct ac97_pcm *pcm, unsigned int cidx, unsigned
  * It assigns available AC97 slots for given PCMs. If none or only
  * some slots are available, pcm->xxx.slots and pcm->xxx.rslots[] members
  * are reduced and might be zero.
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_ac97_pcm_assign(struct snd_ac97_bus *bus,
                         unsigned short pcms_count,
@@ -562,6 +564,8 @@ EXPORT_SYMBOL(snd_ac97_pcm_assign);
  * @slots: a subset of allocated slots (snd_ac97_pcm_assign) for this pcm
  *
  * It locks the specified slots and sets the given rate to AC97 registers.
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_ac97_pcm_open(struct ac97_pcm *pcm, unsigned int rate,
                       enum ac97_pcm_cfg cfg, unsigned short slots)
@@ -644,6 +648,8 @@ EXPORT_SYMBOL(snd_ac97_pcm_open);
  * @pcm: the ac97 pcm instance
  *
  * It frees the locked AC97 slots.
+ *
+ * Return: Zero.
  */
 int snd_ac97_pcm_close(struct ac97_pcm *pcm)
 {
@@ -718,6 +724,8 @@ static int double_rate_hw_constraint_channels(struct snd_pcm_hw_params *params,
  *
  * Installs the hardware constraint rules to prevent using double rates and
  * more than two channels at the same time.
+ *
+ * Return: Zero if successful, or a negative error code on failure.
  */
 int snd_ac97_pcm_double_rate_rules(struct snd_pcm_runtime *runtime)
 {
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index a3ea76a4c9d2..7c11d46b84d3 100644
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
@@ -119,6 +119,32 @@ static bool check_pincap_validity(struct hda_codec *codec, hda_nid_t pin,
         }
 }
 
+static bool can_be_headset_mic(struct hda_codec *codec,
+                               struct auto_pin_cfg_item *item,
+                               int seq_number)
+{
+        int attr;
+        unsigned int def_conf;
+        if (item->type != AUTO_PIN_MIC)
+                return false;
+
+        if (item->is_headset_mic || item->is_headphone_mic)
+                return false; /* Already assigned */
+
+        def_conf = snd_hda_codec_get_pincfg(codec, item->pin);
+        attr = snd_hda_get_input_pin_attr(def_conf);
+        if (attr <= INPUT_PIN_ATTR_DOCK)
+                return false;
+
+        if (seq_number >= 0) {
+                int seq = get_defcfg_sequence(def_conf);
+                if (seq != seq_number)
+                        return false;
+        }
+
+        return true;
+}
+
 /*
  * Parse all pin widgets and store the useful pin nids to cfg
  *
@@ -260,6 +286,38 @@ int snd_hda_parse_pin_defcfg(struct hda_codec *codec,
                 }
         }
 
+        /* Find a pin that could be a headset or headphone mic */
+        if (cond_flags & HDA_PINCFG_HEADSET_MIC || cond_flags & HDA_PINCFG_HEADPHONE_MIC) {
+                bool hsmic = !!(cond_flags & HDA_PINCFG_HEADSET_MIC);
+                bool hpmic = !!(cond_flags & HDA_PINCFG_HEADPHONE_MIC);
+                for (i = 0; (hsmic || hpmic) && (i < cfg->num_inputs); i++)
+                        if (hsmic && can_be_headset_mic(codec, &cfg->inputs[i], 0xc)) {
+                                cfg->inputs[i].is_headset_mic = 1;
+                                hsmic = false;
+                        } else if (hpmic && can_be_headset_mic(codec, &cfg->inputs[i], 0xd)) {
+                                cfg->inputs[i].is_headphone_mic = 1;
+                                hpmic = false;
+                        }
+
+                /* If we didn't find our sequence number mark, fall back to any sequence number */
+                for (i = 0; (hsmic || hpmic) && (i < cfg->num_inputs); i++) {
+                        if (!can_be_headset_mic(codec, &cfg->inputs[i], -1))
+                                continue;
+                        if (hsmic) {
+                                cfg->inputs[i].is_headset_mic = 1;
+                                hsmic = false;
+                        } else if (hpmic) {
+                                cfg->inputs[i].is_headphone_mic = 1;
+                                hpmic = false;
+                        }
+                }
+
+                if (hsmic)
+                        snd_printdd("Told to look for a headset mic, but didn't find any.\n");
+                if (hpmic)
+                        snd_printdd("Told to look for a headphone mic, but didn't find any.\n");
+        }
+
         /* FIX-UP:
          * If no line-out is defined but multiple HPs are found,
          * some of them might be the real line-outs.
@@ -388,6 +446,7 @@ EXPORT_SYMBOL_HDA(snd_hda_get_input_pin_attr);
  */
 
 static const char *hda_get_input_pin_label(struct hda_codec *codec,
+                                           const struct auto_pin_cfg_item *item,
                                            hda_nid_t pin, bool check_location)
 {
         unsigned int def_conf;
@@ -400,6 +459,10 @@ static const char *hda_get_input_pin_label(struct hda_codec *codec,
 
         switch (get_defcfg_device(def_conf)) {
         case AC_JACK_MIC_IN:
+                if (item && item->is_headset_mic)
+                        return "Headset Mic";
+                if (item && item->is_headphone_mic)
+                        return "Headphone Mic";
                 if (!check_location)
                         return "Mic";
                 attr = snd_hda_get_input_pin_attr(def_conf);
@@ -480,7 +543,8 @@ const char *hda_get_autocfg_input_label(struct hda_codec *codec,
                 has_multiple_pins = 1;
         if (has_multiple_pins && type == AUTO_PIN_MIC)
                 has_multiple_pins &= check_mic_location_need(codec, cfg, input);
-        return hda_get_input_pin_label(codec, cfg->inputs[input].pin,
+        return hda_get_input_pin_label(codec, &cfg->inputs[input],
+                                       cfg->inputs[input].pin,
                                        has_multiple_pins);
 }
 EXPORT_SYMBOL_HDA(hda_get_autocfg_input_label);
@@ -649,7 +713,7 @@ int snd_hda_get_pin_label(struct hda_codec *codec, hda_nid_t nid,
                         }
                 }
                 if (!name)
-                        name = hda_get_input_pin_label(codec, nid, true);
+                        name = hda_get_input_pin_label(codec, NULL, nid, true);
                 break;
         }
         if (!name)
diff --git a/sound/pci/hda/hda_auto_parser.h b/sound/pci/hda/hda_auto_parser.h
index f74807138b49..e941f604f5e5 100644
--- a/sound/pci/hda/hda_auto_parser.h
+++ b/sound/pci/hda/hda_auto_parser.h
@@ -36,6 +36,8 @@ enum {
 struct auto_pin_cfg_item {
         hda_nid_t pin;
         int type;
+        unsigned int is_headset_mic:1;
+        unsigned int is_headphone_mic:1; /* Mic-only in headphone jack */
 };
 
 struct auto_pin_cfg;
@@ -78,8 +80,10 @@ struct auto_pin_cfg {
 };
 
 /* bit-flags for snd_hda_parse_pin_def_config() behavior */
-#define HDA_PINCFG_NO_HP_FIXUP  (1 << 0) /* no HP-split */
-#define HDA_PINCFG_NO_LO_FIXUP  (1 << 1) /* don't take other outs as LO */
+#define HDA_PINCFG_NO_HP_FIXUP   (1 << 0) /* no HP-split */
+#define HDA_PINCFG_NO_LO_FIXUP   (1 << 1) /* don't take other outs as LO */
+#define HDA_PINCFG_HEADSET_MIC   (1 << 2) /* Try to find headset mic; mark seq number as 0xc to trigger */
+#define HDA_PINCFG_HEADPHONE_MIC (1 << 3) /* Try to find headphone mic; mark seq number as 0xd to trigger */
 
 int snd_hda_parse_pin_defcfg(struct hda_codec *codec,
                              struct auto_pin_cfg *cfg,
@@ -90,4 +94,25 @@ int snd_hda_parse_pin_defcfg(struct hda_codec *codec,
 #define snd_hda_parse_pin_def_config(codec, cfg, ignore) \
         snd_hda_parse_pin_defcfg(codec, cfg, ignore, 0)
 
+static inline int auto_cfg_hp_outs(const struct auto_pin_cfg *cfg)
+{
+        return (cfg->line_out_type == AUTO_PIN_HP_OUT) ?
+               cfg->line_outs : cfg->hp_outs;
+}
+static inline const hda_nid_t *auto_cfg_hp_pins(const struct auto_pin_cfg *cfg)
+{
+        return (cfg->line_out_type == AUTO_PIN_HP_OUT) ?
+               cfg->line_out_pins : cfg->hp_pins;
+}
+static inline int auto_cfg_speaker_outs(const struct auto_pin_cfg *cfg)
+{
+        return (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT) ?
+               cfg->line_outs : cfg->speaker_outs;
+}
+static inline const hda_nid_t *auto_cfg_speaker_pins(const struct auto_pin_cfg *cfg)
+{
+        return (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT) ?
+               cfg->line_out_pins : cfg->speaker_pins;
+}
+
 #endif /* __SOUND_HDA_AUTO_PARSER_H */
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
index 0849aac449f2..63c99090a4ec 100644
--- a/sound/pci/hda/hda_beep.c
+++ b/sound/pci/hda/hda_beep.c
@@ -39,13 +39,23 @@ static void snd_hda_generate_beep(struct work_struct *work)
         struct hda_beep *beep =
                 container_of(work, struct hda_beep, beep_work);
         struct hda_codec *codec = beep->codec;
+        int tone;
 
         if (!beep->enabled)
                 return;
 
+        tone = beep->tone;
+        if (tone && !beep->playing) {
+                snd_hda_power_up(codec);
+                beep->playing = 1;
+        }
         /* generate tone */
         snd_hda_codec_write(codec, beep->nid, 0,
-                        AC_VERB_SET_BEEP_CONTROL, beep->tone);
+                            AC_VERB_SET_BEEP_CONTROL, tone);
+        if (!tone && beep->playing) {
+                beep->playing = 0;
+                snd_hda_power_down(codec);
+        }
 }
 
 /* (non-standard) Linear beep tone calculation for IDT/STAC codecs 
@@ -115,14 +125,23 @@ static int snd_hda_beep_event(struct input_dev *dev, unsigned int type,
         return 0;
 }
 
+static void turn_off_beep(struct hda_beep *beep)
+{
+        cancel_work_sync(&beep->beep_work);
+        if (beep->playing) {
+                /* turn off beep */
+                snd_hda_codec_write(beep->codec, beep->nid, 0,
+                                    AC_VERB_SET_BEEP_CONTROL, 0);
+                beep->playing = 0;
+                snd_hda_power_down(beep->codec);
+        }
+}
+
 static void snd_hda_do_detach(struct hda_beep *beep)
 {
         input_unregister_device(beep->dev);
         beep->dev = NULL;
-        cancel_work_sync(&beep->beep_work);
-        /* turn off beep for sure */
-        snd_hda_codec_write(beep->codec, beep->nid, 0,
-                                  AC_VERB_SET_BEEP_CONTROL, 0);
+        turn_off_beep(beep);
 }
 
 static int snd_hda_do_attach(struct hda_beep *beep)
@@ -170,12 +189,8 @@ int snd_hda_enable_beep_device(struct hda_codec *codec, int enable)
         enable = !!enable;
         if (beep->enabled != enable) {
                 beep->enabled = enable;
-                if (!enable) {
-                        cancel_work_sync(&beep->beep_work);
-                        /* turn off beep */
-                        snd_hda_codec_write(beep->codec, beep->nid, 0,
-                                                  AC_VERB_SET_BEEP_CONTROL, 0);
-                }
+                if (!enable)
+                        turn_off_beep(beep);
                 return 1;
         }
         return 0;
@@ -198,7 +213,7 @@ int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
         snprintf(beep->phys, sizeof(beep->phys),
                 "card%d/codec#%d/beep0", codec->bus->card->number, codec->addr);
         /* enable linear scale */
-        snd_hda_codec_write(codec, nid, 0,
+        snd_hda_codec_write_cache(codec, nid, 0,
                 AC_VERB_SET_DIGI_CONVERT_2, 0x01);
 
         beep->nid = nid;
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index 4dc6933bc655..cb88464676b6 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -36,6 +36,7 @@ struct hda_beep {
         hda_nid_t nid;
         unsigned int enabled:1;
         unsigned int linear_tone:1;     /* linear tone for IDT/STAC codec */
+        unsigned int playing:1;
         struct work_struct beep_work; /* scheduled task for beep event */
         struct mutex mutex;
 };
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 4aba7646dd9c..e37b7388e8aa 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1300,8 +1300,6 @@ static bool snd_hda_codec_get_supported_ps(struct hda_codec *codec,
 
 static unsigned int hda_set_power_state(struct hda_codec *codec,
                                 unsigned int power_state);
-static unsigned int default_power_filter(struct hda_codec *codec, hda_nid_t nid,
-                                         unsigned int power_state);
 
 /**
  * snd_hda_codec_new - create a HDA codec
@@ -1422,7 +1420,6 @@ int snd_hda_codec_new(struct hda_bus *bus,
 #endif
         codec->epss = snd_hda_codec_get_supported_ps(codec, fg,
                                         AC_PWRST_EPSS);
-        codec->power_filter = default_power_filter;
 
         /* power-up all before initialization */
         hda_set_power_state(codec, AC_PWRST_D0);
@@ -3770,8 +3767,9 @@ static unsigned int hda_sync_power_state(struct hda_codec *codec,
 }
 
 /* don't power down the widget if it controls eapd and EAPD_BTLENABLE is set */
-static unsigned int default_power_filter(struct hda_codec *codec, hda_nid_t nid,
-                                         unsigned int power_state)
+unsigned int snd_hda_codec_eapd_power_filter(struct hda_codec *codec,
+                                             hda_nid_t nid,
+                                             unsigned int power_state)
 {
         if (power_state == AC_PWRST_D3 &&
             get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_PIN &&
@@ -3783,6 +3781,7 @@ static unsigned int default_power_filter(struct hda_codec *codec, hda_nid_t nid,
         }
         return power_state;
 }
+EXPORT_SYMBOL_HDA(snd_hda_codec_eapd_power_filter);
 
 /*
  * set power state of the codec, and return the power state
@@ -3827,8 +3826,8 @@ static void sync_power_up_states(struct hda_codec *codec)
         hda_nid_t nid = codec->start_nid;
         int i;
 
-        /* don't care if no or standard filter is used */
-        if (!codec->power_filter || codec->power_filter == default_power_filter)
+        /* don't care if no filter is used */
+        if (!codec->power_filter)
                 return;
 
         for (i = 0; i < codec->num_nodes; i++, nid++) {
@@ -5546,14 +5545,12 @@ void *snd_array_new(struct snd_array *array)
         if (array->used >= array->alloced) {
                 int num = array->alloced + array->alloc_align;
                 int size = (num + 1) * array->elem_size;
-                int oldsize = array->alloced * array->elem_size;
                 void *nlist;
                 if (snd_BUG_ON(num >= 4096))
                         return NULL;
-                nlist = krealloc(array->list, size, GFP_KERNEL);
+                nlist = krealloc(array->list, size, GFP_KERNEL | __GFP_ZERO);
                 if (!nlist)
                         return NULL;
-                memset(nlist + oldsize, 0, size - oldsize);
                 array->list = nlist;
                 array->alloced = num;
         }
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 23ca1722aff1..c93f9021f452 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -757,6 +757,9 @@ struct hda_pcm_ops {
                        struct snd_pcm_substream *substream);
         int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
                        struct snd_pcm_substream *substream);
+        unsigned int (*get_delay)(struct hda_pcm_stream *info,
+                                  struct hda_codec *codec,
+                                  struct snd_pcm_substream *substream);
 };
 
 /* PCM information for each substream */
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 2dbe767be16b..c7b59ddc4bce 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -34,6 +34,7 @@
 #include "hda_local.h"
 #include "hda_auto_parser.h"
 #include "hda_jack.h"
+#include "hda_beep.h"
 #include "hda_generic.h"
 
 
@@ -150,15 +151,25 @@ static void parse_user_hints(struct hda_codec *codec)
         val = snd_hda_get_bool_hint(codec, "add_stereo_mix_input");
         if (val >= 0)
                 spec->add_stereo_mix_input = !!val;
+        /* the following two are just for compatibility */
         val = snd_hda_get_bool_hint(codec, "add_out_jack_modes");
         if (val >= 0)
-                spec->add_out_jack_modes = !!val;
+                spec->add_jack_modes = !!val;
         val = snd_hda_get_bool_hint(codec, "add_in_jack_modes");
         if (val >= 0)
-                spec->add_in_jack_modes = !!val;
+                spec->add_jack_modes = !!val;
+        val = snd_hda_get_bool_hint(codec, "add_jack_modes");
+        if (val >= 0)
+                spec->add_jack_modes = !!val;
         val = snd_hda_get_bool_hint(codec, "power_down_unused");
         if (val >= 0)
                 spec->power_down_unused = !!val;
+        val = snd_hda_get_bool_hint(codec, "add_hp_mic");
+        if (val >= 0)
+                spec->hp_mic = !!val;
+        val = snd_hda_get_bool_hint(codec, "hp_mic_detect");
+        if (val >= 0)
+                spec->suppress_hp_mic_detect = !val;
 
         if (!snd_hda_get_int_hint(codec, "mixer_nid", &val))
                 spec->mixer_nid = val;
@@ -996,7 +1007,7 @@ enum {
         /* Primary DAC shared with main surrounds */
         BAD_SHARED_SURROUND = 0x100,
         /* No independent HP possible */
-        BAD_NO_INDEP_HP = 0x40,
+        BAD_NO_INDEP_HP = 0x10,
         /* Primary DAC shared with main CLFE */
         BAD_SHARED_CLFE = 0x10,
         /* Primary DAC shared with extra surrounds */
@@ -1051,16 +1062,7 @@ static int assign_out_path_ctls(struct hda_codec *codec, struct nid_path *path)
         return badness;
 }
 
-struct badness_table {
-        int no_primary_dac;     /* no primary DAC */
-        int no_dac;             /* no secondary DACs */
-        int shared_primary;     /* primary DAC is shared with main output */
-        int shared_surr;        /* secondary DAC shared with main or primary */
-        int shared_clfe;        /* third DAC shared with main or primary */
-        int shared_surr_main;   /* secondary DAC sahred with main/DAC0 */
-};
-
-static struct badness_table main_out_badness = {
+const struct badness_table hda_main_out_badness = {
         .no_primary_dac = BAD_NO_PRIMARY_DAC,
         .no_dac = BAD_NO_DAC,
         .shared_primary = BAD_NO_PRIMARY_DAC,
@@ -1068,8 +1070,9 @@ static struct badness_table main_out_badness = {
         .shared_clfe = BAD_SHARED_CLFE,
         .shared_surr_main = BAD_SHARED_SURROUND,
 };
+EXPORT_SYMBOL_HDA(hda_main_out_badness);
 
-static struct badness_table extra_out_badness = {
+const struct badness_table hda_extra_out_badness = {
         .no_primary_dac = BAD_NO_DAC,
         .no_dac = BAD_NO_DAC,
         .shared_primary = BAD_NO_EXTRA_DAC,
@@ -1077,6 +1080,7 @@ static struct badness_table extra_out_badness = {
         .shared_clfe = BAD_SHARED_EXTRA_SURROUND,
         .shared_surr_main = BAD_NO_EXTRA_SURR_DAC,
 };
+EXPORT_SYMBOL_HDA(hda_extra_out_badness);
 
 /* get the DAC of the primary output corresponding to the given array index */
 static hda_nid_t get_primary_out(struct hda_codec *codec, int idx)
@@ -1507,7 +1511,7 @@ static int fill_and_eval_dacs(struct hda_codec *codec,
 
         badness += try_assign_dacs(codec, cfg->line_outs, cfg->line_out_pins,
                                    spec->private_dac_nids, spec->out_paths,
-                                   &main_out_badness);
+                                   spec->main_out_badness);
 
         if (fill_mio_first &&
             cfg->line_outs == 1 && cfg->line_out_type != AUTO_PIN_SPEAKER_OUT) {
@@ -1522,7 +1526,7 @@ static int fill_and_eval_dacs(struct hda_codec *codec,
                 err = try_assign_dacs(codec, cfg->hp_outs, cfg->hp_pins,
                                       spec->multiout.hp_out_nid,
                                       spec->hp_paths,
-                                      &extra_out_badness);
+                                      spec->extra_out_badness);
                 if (err < 0)
                         return err;
                 badness += err;
@@ -1532,7 +1536,7 @@ static int fill_and_eval_dacs(struct hda_codec *codec,
                                       cfg->speaker_pins,
                                       spec->multiout.extra_out_nid,
                                       spec->speaker_paths,
-                                      &extra_out_badness);
+                                      spec->extra_out_badness);
                 if (err < 0)
                         return err;
                 badness += err;
@@ -1926,6 +1930,17 @@ static int create_speaker_out_ctls(struct hda_codec *codec)
  * independent HP controls
  */
 
+/* update HP auto-mute state too */
+static void update_hp_automute_hook(struct hda_codec *codec)
+{
+        struct hda_gen_spec *spec = codec->spec;
+
+        if (spec->hp_automute_hook)
+                spec->hp_automute_hook(codec, NULL);
+        else
+                snd_hda_gen_hp_automute(codec, NULL);
+}
+
 static int indep_hp_info(struct snd_kcontrol *kcontrol,
                          struct snd_ctl_elem_info *uinfo)
 {
@@ -1986,12 +2001,7 @@ static int indep_hp_put(struct snd_kcontrol *kcontrol,
                 else
                         *dacp = spec->alt_dac_nid;
 
-                /* update HP auto-mute state too */
-                if (spec->hp_automute_hook)
-                        spec->hp_automute_hook(codec, NULL);
-                else
-                        snd_hda_gen_hp_automute(codec, NULL);
-
+                update_hp_automute_hook(codec);
                 ret = 1;
         }
  unlock:
@@ -2240,63 +2250,95 @@ static int create_loopback_mixing_ctl(struct hda_codec *codec)
 static void call_update_outputs(struct hda_codec *codec);
 
 /* for shared I/O, change the pin-control accordingly */
-static void update_shared_mic_hp(struct hda_codec *codec, bool set_as_mic)
+static void update_hp_mic(struct hda_codec *codec, int adc_mux, bool force)
 {
         struct hda_gen_spec *spec = codec->spec;
+        bool as_mic;
         unsigned int val;
-        hda_nid_t pin = spec->autocfg.inputs[1].pin;
-        /* NOTE: this assumes that there are only two inputs, the
-         * first is the real internal mic and the second is HP/mic jack.
-         */
+        hda_nid_t pin;
 
-        val = snd_hda_get_default_vref(codec, pin);
+        pin = spec->hp_mic_pin;
+        as_mic = spec->cur_mux[adc_mux] == spec->hp_mic_mux_idx;
+
+        if (!force) {
+                val = snd_hda_codec_get_pin_target(codec, pin);
+                if (as_mic) {
+                        if (val & PIN_IN)
+                                return;
+                } else {
+                        if (val & PIN_OUT)
+                                return;
+                }
+        }
 
-        /* This pin does not have vref caps - let's enable vref on pin 0x18
-           instead, as suggested by Realtek */
+        val = snd_hda_get_default_vref(codec, pin);
+        /* if the HP pin doesn't support VREF and the codec driver gives an
+         * alternative pin, set up the VREF on that pin instead
+         */
         if (val == AC_PINCTL_VREF_HIZ && spec->shared_mic_vref_pin) {
                 const hda_nid_t vref_pin = spec->shared_mic_vref_pin;
                 unsigned int vref_val = snd_hda_get_default_vref(codec, vref_pin);
                 if (vref_val != AC_PINCTL_VREF_HIZ)
                         snd_hda_set_pin_ctl_cache(codec, vref_pin,
-                                        PIN_IN | (set_as_mic ? vref_val : 0));
+                                                  PIN_IN | (as_mic ? vref_val : 0));
         }
 
-        val = set_as_mic ? val | PIN_IN : PIN_HP;
-        set_pin_target(codec, pin, val, true);
-
-        spec->automute_speaker = !set_as_mic;
-        call_update_outputs(codec);
+        if (!spec->hp_mic_jack_modes) {
+                if (as_mic)
+                        val |= PIN_IN;
+                else
+                        val = PIN_HP;
+                set_pin_target(codec, pin, val, true);
+                update_hp_automute_hook(codec);
+        }
 }
 
 /* create a shared input with the headphone out */
-static int create_shared_input(struct hda_codec *codec)
+static int create_hp_mic(struct hda_codec *codec)
 {
         struct hda_gen_spec *spec = codec->spec;
         struct auto_pin_cfg *cfg = &spec->autocfg;
         unsigned int defcfg;
         hda_nid_t nid;
 
-        /* only one internal input pin? */
-        if (cfg->num_inputs != 1)
-                return 0;
-        defcfg = snd_hda_codec_get_pincfg(codec, cfg->inputs[0].pin);
-        if (snd_hda_get_input_pin_attr(defcfg) != INPUT_PIN_ATTR_INT)
+        if (!spec->hp_mic) {
+                if (spec->suppress_hp_mic_detect)
+                        return 0;
+                /* automatic detection: only if no input or a single internal
+                 * input pin is found, try to detect the shared hp/mic
+                 */
+                if (cfg->num_inputs > 1)
+                        return 0;
+                else if (cfg->num_inputs == 1) {
+                        defcfg = snd_hda_codec_get_pincfg(codec, cfg->inputs[0].pin);
+                        if (snd_hda_get_input_pin_attr(defcfg) != INPUT_PIN_ATTR_INT)
+                                return 0;
+                }
+        }
+
+        spec->hp_mic = 0; /* clear once */
+        if (cfg->num_inputs >= AUTO_CFG_MAX_INS)
                 return 0;
 
-        if (cfg->hp_outs == 1 && cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
-                nid = cfg->hp_pins[0]; /* OK, we have a single HP-out */
-        else if (cfg->line_outs == 1 && cfg->line_out_type == AUTO_PIN_HP_OUT)
-                nid = cfg->line_out_pins[0]; /* OK, we have a single line-out */
-        else
-                return 0; /* both not available */
+        nid = 0;
+        if (cfg->line_out_type == AUTO_PIN_HP_OUT && cfg->line_outs > 0)
+                nid = cfg->line_out_pins[0];
+        else if (cfg->hp_outs > 0)
+                nid = cfg->hp_pins[0];
+        if (!nid)
+                return 0;
 
         if (!(snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_IN))
                 return 0; /* no input */
 
-        cfg->inputs[1].pin = nid;
-        cfg->inputs[1].type = AUTO_PIN_MIC;
-        cfg->num_inputs = 2;
-        spec->shared_mic_hp = 1;
+        cfg->inputs[cfg->num_inputs].pin = nid;
+        cfg->inputs[cfg->num_inputs].type = AUTO_PIN_MIC;
+        cfg->inputs[cfg->num_inputs].is_headphone_mic = 1;
+        cfg->num_inputs++;
+        spec->hp_mic = 1;
+        spec->hp_mic_pin = nid;
+        /* we can't handle auto-mic together with HP-mic */
+        spec->suppress_auto_mic = 1;
         snd_printdd("hda-codec: Enable shared I/O jack on NID 0x%x\n", nid);
         return 0;
 }
@@ -2304,13 +2346,17 @@ static int create_shared_input(struct hda_codec *codec)
 /*
  * output jack mode
  */
+
+static int create_hp_mic_jack_mode(struct hda_codec *codec, hda_nid_t pin);
+
+static const char * const out_jack_texts[] = {
+        "Line Out", "Headphone Out",
+};
+
 static int out_jack_mode_info(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_info *uinfo)
 {
-        static const char * const texts[] = {
-                "Line Out", "Headphone Out",
-        };
-        return snd_hda_enum_helper_info(kcontrol, uinfo, 2, texts);
+        return snd_hda_enum_helper_info(kcontrol, uinfo, 2, out_jack_texts);
 }
 
 static int out_jack_mode_get(struct snd_kcontrol *kcontrol,
@@ -2372,6 +2418,17 @@ static void get_jack_mode_name(struct hda_codec *codec, hda_nid_t pin,
                 ;
 }
 
+static int get_out_jack_num_items(struct hda_codec *codec, hda_nid_t pin)
+{
+        struct hda_gen_spec *spec = codec->spec;
+        if (spec->add_jack_modes) {
+                unsigned int pincap = snd_hda_query_pin_caps(codec, pin);
+                if ((pincap & AC_PINCAP_OUT) && (pincap & AC_PINCAP_HP_DRV))
+                        return 2;
+        }
+        return 1;
+}
+
 static int create_out_jack_modes(struct hda_codec *codec, int num_pins,
                                  hda_nid_t *pins)
 {
@@ -2380,8 +2437,13 @@ static int create_out_jack_modes(struct hda_codec *codec, int num_pins,
 
         for (i = 0; i < num_pins; i++) {
                 hda_nid_t pin = pins[i];
-                unsigned int pincap = snd_hda_query_pin_caps(codec, pin);
-                if ((pincap & AC_PINCAP_OUT) && (pincap & AC_PINCAP_HP_DRV)) {
+                if (pin == spec->hp_mic_pin) {
+                        int ret = create_hp_mic_jack_mode(codec, pin);
+                        if (ret < 0)
+                                return ret;
+                        continue;
+                }
+                if (get_out_jack_num_items(codec, pin) > 1) {
                         struct snd_kcontrol_new *knew;
                         char name[44];
                         get_jack_mode_name(codec, pin, name, sizeof(name));
@@ -2502,12 +2564,24 @@ static const struct snd_kcontrol_new in_jack_mode_enum = {
         .put = in_jack_mode_put,
 };
 
+static int get_in_jack_num_items(struct hda_codec *codec, hda_nid_t pin)
+{
+        struct hda_gen_spec *spec = codec->spec;
+        int nitems = 0;
+        if (spec->add_jack_modes)
+                nitems = hweight32(get_vref_caps(codec, pin));
+        return nitems ? nitems : 1;
+}
+
 static int create_in_jack_mode(struct hda_codec *codec, hda_nid_t pin)
 {
         struct hda_gen_spec *spec = codec->spec;
-        unsigned int defcfg;
         struct snd_kcontrol_new *knew;
         char name[44];
+        unsigned int defcfg;
+
+        if (pin == spec->hp_mic_pin)
+                return 0; /* already done in create_out_jack_mode() */
 
         /* no jack mode for fixed pins */
         defcfg = snd_hda_codec_get_pincfg(codec, pin);
@@ -2515,7 +2589,7 @@ static int create_in_jack_mode(struct hda_codec *codec, hda_nid_t pin)
                 return 0;
 
         /* no multiple vref caps? */
-        if (hweight32(get_vref_caps(codec, pin)) <= 1)
+        if (get_in_jack_num_items(codec, pin) <= 1)
                 return 0;
 
         get_jack_mode_name(codec, pin, name, sizeof(name));
@@ -2526,6 +2600,132 @@ static int create_in_jack_mode(struct hda_codec *codec, hda_nid_t pin)
         return 0;
 }
 
+/*
+ * HP/mic shared jack mode
+ */
+static int hp_mic_jack_mode_info(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_info *uinfo)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value;
+        int out_jacks = get_out_jack_num_items(codec, nid);
+        int in_jacks = get_in_jack_num_items(codec, nid);
+        const char *text = NULL;
+        int idx;
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = out_jacks + in_jacks;
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+        idx = uinfo->value.enumerated.item;
+        if (idx < out_jacks) {
+                if (out_jacks > 1)
+                        text = out_jack_texts[idx];
+                else
+                        text = "Headphone Out";
+        } else {
+                idx -= out_jacks;
+                if (in_jacks > 1) {
+                        unsigned int vref_caps = get_vref_caps(codec, nid);
+                        text = vref_texts[get_vref_idx(vref_caps, idx)];
+                } else
+                        text = "Mic In";
+        }
+
+        strcpy(uinfo->value.enumerated.name, text);
+        return 0;
+}
+
+static int get_cur_hp_mic_jack_mode(struct hda_codec *codec, hda_nid_t nid)
+{
+        int out_jacks = get_out_jack_num_items(codec, nid);
+        int in_jacks = get_in_jack_num_items(codec, nid);
+        unsigned int val = snd_hda_codec_get_pin_target(codec, nid);
+        int idx = 0;
+
+        if (val & PIN_OUT) {
+                if (out_jacks > 1 && val == PIN_HP)
+                        idx = 1;
+        } else if (val & PIN_IN) {
+                idx = out_jacks;
+                if (in_jacks > 1) {
+                        unsigned int vref_caps = get_vref_caps(codec, nid);
+                        val &= AC_PINCTL_VREFEN;
+                        idx += cvt_from_vref_idx(vref_caps, val);
+                }
+        }
+        return idx;
+}
+
+static int hp_mic_jack_mode_get(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value;
+        ucontrol->value.enumerated.item[0] =
+                get_cur_hp_mic_jack_mode(codec, nid);
+        return 0;
+}
+
+static int hp_mic_jack_mode_put(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value;
+        int out_jacks = get_out_jack_num_items(codec, nid);
+        int in_jacks = get_in_jack_num_items(codec, nid);
+        unsigned int val, oldval, idx;
+
+        oldval = get_cur_hp_mic_jack_mode(codec, nid);
+        idx = ucontrol->value.enumerated.item[0];
+        if (oldval == idx)
+                return 0;
+
+        if (idx < out_jacks) {
+                if (out_jacks > 1)
+                        val = idx ? PIN_HP : PIN_OUT;
+                else
+                        val = PIN_HP;
+        } else {
+                idx -= out_jacks;
+                if (in_jacks > 1) {
+                        unsigned int vref_caps = get_vref_caps(codec, nid);
+                        val = snd_hda_codec_get_pin_target(codec, nid);
+                        val &= ~(AC_PINCTL_VREFEN | PIN_HP);
+                        val |= get_vref_idx(vref_caps, idx) | PIN_IN;
+                } else
+                        val = snd_hda_get_default_vref(codec, nid);
+        }
+        snd_hda_set_pin_ctl_cache(codec, nid, val);
+        update_hp_automute_hook(codec);
+
+        return 1;
+}
+
+static const struct snd_kcontrol_new hp_mic_jack_mode_enum = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .info = hp_mic_jack_mode_info,
+        .get = hp_mic_jack_mode_get,
+        .put = hp_mic_jack_mode_put,
+};
+
+static int create_hp_mic_jack_mode(struct hda_codec *codec, hda_nid_t pin)
+{
+        struct hda_gen_spec *spec = codec->spec;
+        struct snd_kcontrol_new *knew;
+
+        if (get_out_jack_num_items(codec, pin) <= 1 &&
+            get_in_jack_num_items(codec, pin) <= 1)
+                return 0; /* no need */
+        knew = snd_hda_gen_add_kctl(spec, "Headphone Mic Jack Mode",
+                                    &hp_mic_jack_mode_enum);
+        if (!knew)
+                return -ENOMEM;
+        knew->private_value = pin;
+        spec->hp_mic_jack_modes = 1;
+        return 0;
+}
 
 /*
  * Parse input paths
@@ -2648,7 +2848,6 @@ static int check_dyn_adc_switch(struct hda_codec *codec)
         unsigned int ok_bits;
         int i, n, nums;
 
- again:
         nums = 0;
         ok_bits = 0;
         for (n = 0; n < spec->num_adc_nids; n++) {
@@ -2663,12 +2862,6 @@ static int check_dyn_adc_switch(struct hda_codec *codec)
         }
 
         if (!ok_bits) {
-                if (spec->shared_mic_hp) {
-                        spec->shared_mic_hp = 0;
-                        imux->num_items = 1;
-                        goto again;
-                }
-
                 /* check whether ADC-switch is possible */
                 for (i = 0; i < imux->num_items; i++) {
                         for (n = 0; n < spec->num_adc_nids; n++) {
@@ -2701,7 +2894,8 @@ static int check_dyn_adc_switch(struct hda_codec *codec)
                 spec->num_adc_nids = nums;
         }
 
-        if (imux->num_items == 1 || spec->shared_mic_hp) {
+        if (imux->num_items == 1 ||
+            (imux->num_items == 2 && spec->hp_mic)) {
                 snd_printdd("hda-codec: reducing to a single ADC\n");
                 spec->num_adc_nids = 1; /* reduce to a single ADC */
         }
@@ -2738,6 +2932,8 @@ static int parse_capture_source(struct hda_codec *codec, hda_nid_t pin,
                         snd_hda_get_path_idx(codec, path);
 
                 if (!imux_added) {
+                        if (spec->hp_mic_pin == pin)
+                                spec->hp_mic_mux_idx = imux->num_items;
                         spec->imux_pins[imux->num_items] = pin;
                         snd_hda_add_imux_item(imux, label, cfg_idx, NULL);
                         imux_added = true;
@@ -2812,7 +3008,8 @@ static int create_input_ctls(struct hda_codec *codec)
                 val = PIN_IN;
                 if (cfg->inputs[i].type == AUTO_PIN_MIC)
                         val |= snd_hda_get_default_vref(codec, pin);
-                set_pin_target(codec, pin, val, false);
+                if (pin != spec->hp_mic_pin)
+                        set_pin_target(codec, pin, val, false);
 
                 if (mixer) {
                         if (is_reachable_path(codec, pin, mixer)) {
@@ -2830,7 +3027,7 @@ static int create_input_ctls(struct hda_codec *codec)
                 if (err < 0)
                         return err;
 
-                if (spec->add_in_jack_modes) {
+                if (spec->add_jack_modes) {
                         err = create_in_jack_mode(codec, pin);
                         if (err < 0)
                                 return err;
@@ -3462,8 +3659,8 @@ static int mux_select(struct hda_codec *codec, unsigned int adc_idx,
 
         spec->cur_mux[adc_idx] = idx;
 
-        if (spec->shared_mic_hp)
-                update_shared_mic_hp(codec, spec->cur_mux[adc_idx]);
+        if (spec->hp_mic)
+                update_hp_mic(codec, adc_idx, false);
 
         if (spec->dyn_adc_switch)
                 dyn_adc_pcm_resetup(codec, idx);
@@ -3511,18 +3708,21 @@ static void do_automute(struct hda_codec *codec, int num_pins, hda_nid_t *pins,
 
         for (i = 0; i < num_pins; i++) {
                 hda_nid_t nid = pins[i];
-                unsigned int val;
+                unsigned int val, oldval;
                 if (!nid)
                         break;
+                oldval = snd_hda_codec_get_pin_target(codec, nid);
+                if (oldval & PIN_IN)
+                        continue; /* no mute for inputs */
                 /* don't reset VREF value in case it's controlling
                  * the amp (see alc861_fixup_asus_amp_vref_0f())
                  */
                 if (spec->keep_vref_in_automute)
-                        val = snd_hda_codec_get_pin_target(codec, nid) & ~PIN_HP;
+                        val = oldval & ~PIN_HP;
                 else
                         val = 0;
                 if (!mute)
-                        val |= snd_hda_codec_get_pin_target(codec, nid);
+                        val |= oldval;
                 /* here we call update_pin_ctl() so that the pinctl is changed
                  * without changing the pinctl target value;
                  * the original target value will be still referred at the
@@ -3543,8 +3743,7 @@ void snd_hda_gen_update_outputs(struct hda_codec *codec)
          * in general, HP pins/amps control should be enabled in all cases,
          * but currently set only for master_mute, just to be safe
          */
-        if (!spec->shared_mic_hp) /* don't change HP-pin when shared with mic */
-                do_automute(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
+        do_automute(codec, ARRAY_SIZE(spec->autocfg.hp_pins),
                     spec->autocfg.hp_pins, spec->master_mute);
 
         if (!spec->automute_speaker)
@@ -3649,10 +3848,7 @@ static void update_automute_all(struct hda_codec *codec)
 {
         struct hda_gen_spec *spec = codec->spec;
 
-        if (spec->hp_automute_hook)
-                spec->hp_automute_hook(codec, NULL);
-        else
-                snd_hda_gen_hp_automute(codec, NULL);
+        update_hp_automute_hook(codec);
         if (spec->line_automute_hook)
                 spec->line_automute_hook(codec, NULL);
         else
@@ -3978,6 +4174,11 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec,
                 cfg = &spec->autocfg;
         }
 
+        if (!spec->main_out_badness)
+                spec->main_out_badness = &hda_main_out_badness;
+        if (!spec->extra_out_badness)
+                spec->extra_out_badness = &hda_extra_out_badness;
+
         fill_all_dac_nids(codec);
 
         if (!cfg->line_outs) {
@@ -4024,7 +4225,7 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec,
         err = create_loopback_mixing_ctl(codec);
         if (err < 0)
                 return err;
-        err = create_shared_input(codec);
+        err = create_hp_mic(codec);
         if (err < 0)
                 return err;
         err = create_input_ctls(codec);
@@ -4050,11 +4251,9 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec,
         if (err < 0)
                 return err;
 
-        if (!spec->shared_mic_hp) {
-                err = check_auto_mic_availability(codec);
-                if (err < 0)
-                        return err;
-        }
+        err = check_auto_mic_availability(codec);
+        if (err < 0)
+                return err;
 
         err = create_capture_mixers(codec);
         if (err < 0)
@@ -4064,7 +4263,7 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec,
         if (err < 0)
                 return err;
 
-        if (spec->add_out_jack_modes) {
+        if (spec->add_jack_modes) {
                 if (cfg->line_out_type != AUTO_PIN_SPEAKER_OUT) {
                         err = create_out_jack_modes(codec, cfg->line_outs,
                                                     cfg->line_out_pins);
@@ -4085,6 +4284,12 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec,
         if (spec->power_down_unused)
                 codec->power_filter = snd_hda_gen_path_power_filter;
 
+        if (!spec->no_analog && spec->beep_nid) {
+                err = snd_hda_attach_beep_device(codec, spec->beep_nid);
+                if (err < 0)
+                        return err;
+        }
+
         return 1;
 }
 EXPORT_SYMBOL_HDA(snd_hda_gen_parse_auto_config);
@@ -4161,17 +4366,6 @@ int snd_hda_gen_build_controls(struct hda_codec *codec)
 
         free_kctls(spec); /* no longer needed */
 
-        if (spec->shared_mic_hp) {
-                int err;
-                int nid = spec->autocfg.inputs[1].pin;
-                err = snd_hda_jack_add_kctl(codec, nid, "Headphone Mic", 0);
-                if (err < 0)
-                        return err;
-                err = snd_hda_jack_detect_enable(codec, nid, 0);
-                if (err < 0)
-                        return err;
-        }
-
         err = snd_hda_jack_add_kctls(codec, &spec->autocfg);
         if (err < 0)
                 return err;
@@ -4826,11 +5020,10 @@ static void init_input_src(struct hda_codec *codec)
                                 snd_hda_activate_path(codec, path, active, false);
                         }
                 }
+                if (spec->hp_mic)
+                        update_hp_mic(codec, c, true);
         }
 
-        if (spec->shared_mic_hp)
-                update_shared_mic_hp(codec, spec->cur_mux[0]);
-
         if (spec->cap_sync_hook)
                 spec->cap_sync_hook(codec, NULL);
 }
@@ -4911,6 +5104,7 @@ EXPORT_SYMBOL_HDA(snd_hda_gen_init);
  */
 void snd_hda_gen_free(struct hda_codec *codec)
 {
+        snd_hda_detach_beep_device(codec);
         snd_hda_gen_spec_free(codec->spec);
         kfree(codec->spec);
         codec->spec = NULL;
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h
index 009b57be96d3..54e665160379 100644
--- a/sound/pci/hda/hda_generic.h
+++ b/sound/pci/hda/hda_generic.h
@@ -76,6 +76,19 @@ enum {
         HDA_GEN_PCM_ACT_CLOSE,
 };
 
+/* DAC assignment badness table */
+struct badness_table {
+        int no_primary_dac;     /* no primary DAC */
+        int no_dac;             /* no secondary DACs */
+        int shared_primary;     /* primary DAC is shared with main output */
+        int shared_surr;        /* secondary DAC shared with main or primary */
+        int shared_clfe;        /* third DAC shared with main or primary */
+        int shared_surr_main;   /* secondary DAC sahred with main/DAC0 */
+};
+
+extern const struct badness_table hda_main_out_badness;
+extern const struct badness_table hda_extra_out_badness;
+
 struct hda_gen_spec {
         char stream_name_analog[32];    /* analog PCM stream */
         const struct hda_pcm_stream *stream_analog_playback;
@@ -145,7 +158,10 @@ struct hda_gen_spec {
         hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS];
         hda_nid_t imux_pins[HDA_MAX_NUM_INPUTS];
         unsigned int dyn_adc_idx[HDA_MAX_NUM_INPUTS];
+        /* shared hp/mic */
         hda_nid_t shared_mic_vref_pin;
+        hda_nid_t hp_mic_pin;
+        int hp_mic_mux_idx;
 
         /* DAC/ADC lists */
         int num_all_dacs;
@@ -200,7 +216,8 @@ struct hda_gen_spec {
 
         /* other parse behavior flags */
         unsigned int need_dac_fix:1; /* need to limit DACs for multi channels */
-        unsigned int shared_mic_hp:1; /* HP/Mic-in sharing */
+        unsigned int hp_mic:1; /* Allow HP as a mic-in */
+        unsigned int suppress_hp_mic_detect:1; /* Don't detect HP/mic */
         unsigned int no_primary_hp:1; /* Don't prefer HP pins to speaker pins */
         unsigned int multi_cap_vol:1; /* allow multiple capture xxx volumes */
         unsigned int inv_dmic_split:1; /* inverted dmic w/a for conexant */
@@ -209,8 +226,7 @@ struct hda_gen_spec {
         unsigned int indep_hp:1; /* independent HP supported */
         unsigned int prefer_hp_amp:1; /* enable HP amp for speaker if any */
         unsigned int add_stereo_mix_input:1; /* add aamix as a capture src */
-        unsigned int add_out_jack_modes:1; /* add output jack mode enum ctls */
-        unsigned int add_in_jack_modes:1; /* add input jack mode enum ctls */
+        unsigned int add_jack_modes:1; /* add i/o jack mode enum ctls */
         unsigned int power_down_unused:1; /* power down unused widgets */
 
         /* other internal flags */
@@ -218,10 +234,18 @@ struct hda_gen_spec {
         unsigned int dyn_adc_switch:1; /* switch ADCs (for ALC275) */
         unsigned int indep_hp_enabled:1; /* independent HP enabled */
         unsigned int have_aamix_ctl:1;
+        unsigned int hp_mic_jack_modes:1;
+
+        /* badness tables for output path evaluations */
+        const struct badness_table *main_out_badness;
+        const struct badness_table *extra_out_badness;
 
         /* loopback mixing mode */
         bool aamix_mode;
 
+        /* digital beep */
+        hda_nid_t beep_nid;
+
         /* for virtual master */
         hda_nid_t vmaster_nid;
         unsigned int vmaster_tlv[4];
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index bcd40ee488e3..63734b531f36 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1889,6 +1889,23 @@ static void azx_timecounter_init(struct snd_pcm_substream *substream,
                 tc->cycle_last = last;
 }
 
+static u64 azx_subtract_codec_delay(struct snd_pcm_substream *substream,
+                                u64 nsec)
+{
+        struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
+        struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream];
+        u64 codec_frames, codec_nsecs;
+
+        if (!hinfo->ops.get_delay)
+                return nsec;
+
+        codec_frames = hinfo->ops.get_delay(hinfo, apcm->codec, substream);
+        codec_nsecs = div_u64(codec_frames * 1000000000LL,
+                              substream->runtime->rate);
+
+        return (nsec > codec_nsecs) ? nsec - codec_nsecs : 0;
+}
+
 static int azx_get_wallclock_tstamp(struct snd_pcm_substream *substream,
                                 struct timespec *ts)
 {
@@ -1897,6 +1914,7 @@ static int azx_get_wallclock_tstamp(struct snd_pcm_substream *substream,
 
         nsec = timecounter_read(&azx_dev->azx_tc);
         nsec = div_u64(nsec, 3); /* can be optimized */
+        nsec = azx_subtract_codec_delay(substream, nsec);
 
         *ts = ns_to_timespec(nsec);
 
@@ -2349,8 +2367,11 @@ static unsigned int azx_get_position(struct azx *chip,
                                      struct azx_dev *azx_dev,
                                      bool with_check)
 {
+        struct snd_pcm_substream *substream = azx_dev->substream;
+        struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
         unsigned int pos;
-        int stream = azx_dev->substream->stream;
+        int stream = substream->stream;
+        struct hda_pcm_stream *hinfo = apcm->hinfo[stream];
         int delay = 0;
 
         switch (chip->position_fix[stream]) {
@@ -2381,7 +2402,7 @@ static unsigned int azx_get_position(struct azx *chip,
                 pos = 0;
 
         /* calculate runtime delay from LPIB */
-        if (azx_dev->substream->runtime &&
+        if (substream->runtime &&
             chip->position_fix[stream] == POS_FIX_POSBUF &&
             (chip->driver_caps & AZX_DCAPS_COUNT_LPIB_DELAY)) {
                 unsigned int lpib_pos = azx_sd_readl(azx_dev, SD_LPIB);
@@ -2399,9 +2420,16 @@ static unsigned int azx_get_position(struct azx *chip,
                         delay = 0;
                         chip->driver_caps &= ~AZX_DCAPS_COUNT_LPIB_DELAY;
                 }
-                azx_dev->substream->runtime->delay =
-                        bytes_to_frames(azx_dev->substream->runtime, delay);
+                delay = bytes_to_frames(substream->runtime, delay);
         }
+
+        if (substream->runtime) {
+                if (hinfo->ops.get_delay)
+                        delay += hinfo->ops.get_delay(hinfo, apcm->codec,
+                                                      substream);
+                substream->runtime->delay = delay;
+        }
+
         trace_azx_get_position(chip, azx_dev, pos, delay);
         return pos;
 }
diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index 1d035efeff4f..9e0a95288f46 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -394,7 +394,8 @@ static int get_unique_index(struct hda_codec *codec, const char *name, int idx)
 }
 
 static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
-                         const struct auto_pin_cfg *cfg)
+                         const struct auto_pin_cfg *cfg,
+                         const char *base_name)
 {
         unsigned int def_conf, conn;
         char name[44];
@@ -410,7 +411,11 @@ static int add_jack_kctl(struct hda_codec *codec, hda_nid_t nid,
         phantom_jack = (conn != AC_JACK_PORT_COMPLEX) ||
                        !is_jack_detectable(codec, nid);
 
-        snd_hda_get_pin_label(codec, nid, cfg, name, sizeof(name), &idx);
+        if (base_name) {
+                strlcpy(name, base_name, sizeof(name));
+                idx = 0;
+        } else
+                snd_hda_get_pin_label(codec, nid, cfg, name, sizeof(name), &idx);
         if (phantom_jack)
                 /* Example final name: "Internal Mic Phantom Jack" */
                 strncat(name, " Phantom", sizeof(name) - strlen(name) - 1);
@@ -433,39 +438,51 @@ int snd_hda_jack_add_kctls(struct hda_codec *codec,
         const hda_nid_t *p;
         int i, err;
 
+        for (i = 0; i < cfg->num_inputs; i++) {
+                /* If we have headphone mics; make sure they get the right name
+                   before grabbed by output pins */
+                if (cfg->inputs[i].is_headphone_mic) {
+                        if (auto_cfg_hp_outs(cfg) == 1)
+                                err = add_jack_kctl(codec, auto_cfg_hp_pins(cfg)[0],
+                                                    cfg, "Headphone Mic");
+                        else
+                                err = add_jack_kctl(codec, cfg->inputs[i].pin,
+                                                    cfg, "Headphone Mic");
+                } else
+                        err = add_jack_kctl(codec, cfg->inputs[i].pin, cfg,
+                                            NULL);
+                if (err < 0)
+                        return err;
+        }
+
         for (i = 0, p = cfg->line_out_pins; i < cfg->line_outs; i++, p++) {
-                err = add_jack_kctl(codec, *p, cfg);
+                err = add_jack_kctl(codec, *p, cfg, NULL);
                 if (err < 0)
                         return err;
         }
         for (i = 0, p = cfg->hp_pins; i < cfg->hp_outs; i++, p++) {
                 if (*p == *cfg->line_out_pins) /* might be duplicated */
                         break;
-                err = add_jack_kctl(codec, *p, cfg);
+                err = add_jack_kctl(codec, *p, cfg, NULL);
                 if (err < 0)
                         return err;
         }
         for (i = 0, p = cfg->speaker_pins; i < cfg->speaker_outs; i++, p++) {
                 if (*p == *cfg->line_out_pins) /* might be duplicated */
                         break;
-                err = add_jack_kctl(codec, *p, cfg);
-                if (err < 0)
-                        return err;
-        }
-        for (i = 0; i < cfg->num_inputs; i++) {
-                err = add_jack_kctl(codec, cfg->inputs[i].pin, cfg);
+                err = add_jack_kctl(codec, *p, cfg, NULL);
                 if (err < 0)
                         return err;
         }
         for (i = 0, p = cfg->dig_out_pins; i < cfg->dig_outs; i++, p++) {
-                err = add_jack_kctl(codec, *p, cfg);
+                err = add_jack_kctl(codec, *p, cfg, NULL);
                 if (err < 0)
                         return err;
         }
-        err = add_jack_kctl(codec, cfg->dig_in_pin, cfg);
+        err = add_jack_kctl(codec, cfg->dig_in_pin, cfg, NULL);
         if (err < 0)
                 return err;
-        err = add_jack_kctl(codec, cfg->mono_out_pin, cfg);
+        err = add_jack_kctl(codec, cfg->mono_out_pin, cfg, NULL);
         if (err < 0)
                 return err;
         return 0;
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 83b7486c8eff..e0bf7534fa1f 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -670,6 +670,10 @@ snd_hda_check_power_state(struct hda_codec *codec, hda_nid_t nid,
         return (state != target_state);
 }
 
+unsigned int snd_hda_codec_eapd_power_filter(struct hda_codec *codec,
+                                             hda_nid_t nid,
+                                             unsigned int power_state);
+
 /*
  * AMP control callbacks
  */
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index df8014b27596..977b0d878dae 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -43,7 +43,6 @@ struct ad198x_spec {
         hda_nid_t eapd_nid;
 
         unsigned int beep_amp;  /* beep amp value, set via set_beep_amp() */
-        hda_nid_t beep_dev_nid;
 
 #ifdef ENABLE_AD_STATIC_QUIRKS
         const struct snd_kcontrol_new *mixers[6];
@@ -609,7 +608,7 @@ static const struct hda_codec_ops ad198x_auto_patch_ops = {
         .build_controls = ad198x_auto_build_controls,
         .build_pcms = snd_hda_gen_build_pcms,
         .init = snd_hda_gen_init,
-        .free = ad198x_free,
+        .free = snd_hda_gen_free,
         .unsol_event = snd_hda_jack_unsol_event,
 #ifdef CONFIG_PM
         .check_power_status = snd_hda_gen_check_power_status,
@@ -638,12 +637,6 @@ static int ad198x_parse_auto_config(struct hda_codec *codec)
         if (err < 0)
                 return err;
 
-        if (spec->beep_dev_nid) {
-                err = snd_hda_attach_beep_device(codec, spec->beep_dev_nid);
-                if (err < 0)
-                        return err;
-        }
-
         codec->patch_ops = ad198x_auto_patch_ops;
 
         return 0;
@@ -1240,7 +1233,7 @@ static int ad1986a_parse_auto_config(struct hda_codec *codec)
         codec->inv_eapd = 1;
 
         spec->gen.mixer_nid = 0x07;
-        spec->beep_dev_nid = 0x19;
+        spec->gen.beep_nid = 0x19;
         set_beep_amp(spec, 0x18, 0, HDA_OUTPUT);
 
         /* AD1986A has a hardware problem that it can't share a stream
@@ -1256,7 +1249,7 @@ static int ad1986a_parse_auto_config(struct hda_codec *codec)
 
         err = ad198x_parse_auto_config(codec);
         if (err < 0) {
-                ad198x_free(codec);
+                snd_hda_gen_free(codec);
                 return err;
         }
 
@@ -1673,7 +1666,7 @@ static int ad1983_parse_auto_config(struct hda_codec *codec)
                 return err;
         spec = codec->spec;
 
-        spec->beep_dev_nid = 0x10;
+        spec->gen.beep_nid = 0x10;
         set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
         err = ad198x_parse_auto_config(codec);
         if (err < 0)
@@ -1684,7 +1677,7 @@ static int ad1983_parse_auto_config(struct hda_codec *codec)
         return 0;
 
  error:
-        ad198x_free(codec);
+        snd_hda_gen_free(codec);
         return err;
 }
 
@@ -2187,7 +2180,7 @@ static int ad1981_parse_auto_config(struct hda_codec *codec)
         spec = codec->spec;
 
         spec->gen.mixer_nid = 0x0e;
-        spec->beep_dev_nid = 0x10;
+        spec->gen.beep_nid = 0x10;
         set_beep_amp(spec, 0x0d, 0, HDA_OUTPUT);
 
         snd_hda_pick_fixup(codec, NULL, ad1981_fixup_tbl, ad1981_fixups);
@@ -2205,7 +2198,7 @@ static int ad1981_parse_auto_config(struct hda_codec *codec)
         return 0;
 
  error:
-        ad198x_free(codec);
+        snd_hda_gen_free(codec);
         return err;
 }
 
@@ -3236,7 +3229,7 @@ static int ad1988_parse_auto_config(struct hda_codec *codec)
 
         spec->gen.mixer_nid = 0x20;
         spec->gen.mixer_merge_nid = 0x21;
-        spec->beep_dev_nid = 0x10;
+        spec->gen.beep_nid = 0x10;
         set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
         err = ad198x_parse_auto_config(codec);
         if (err < 0)
@@ -3247,7 +3240,7 @@ static int ad1988_parse_auto_config(struct hda_codec *codec)
         return 0;
 
  error:
-        ad198x_free(codec);
+        snd_hda_gen_free(codec);
         return err;
 }
 
@@ -3653,7 +3646,7 @@ static int ad1884_parse_auto_config(struct hda_codec *codec)
         spec = codec->spec;
 
         spec->gen.mixer_nid = 0x20;
-        spec->beep_dev_nid = 0x10;
+        spec->gen.beep_nid = 0x10;
         set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
 
         snd_hda_pick_fixup(codec, NULL, ad1884_fixup_tbl, ad1884_fixups);
@@ -3671,7 +3664,7 @@ static int ad1884_parse_auto_config(struct hda_codec *codec)
         return 0;
 
  error:
-        ad198x_free(codec);
+        snd_hda_gen_free(codec);
         return err;
 }
 
@@ -5155,7 +5148,7 @@ static int ad1882_parse_auto_config(struct hda_codec *codec)
 
         spec->gen.mixer_nid = 0x20;
         spec->gen.mixer_merge_nid = 0x21;
-        spec->beep_dev_nid = 0x10;
+        spec->gen.beep_nid = 0x10;
         set_beep_amp(spec, 0x10, 0, HDA_OUTPUT);
         err = ad198x_parse_auto_config(codec);
         if (err < 0)
@@ -5166,7 +5159,7 @@ static int ad1882_parse_auto_config(struct hda_codec *codec)
         return 0;
 
  error:
-        ad198x_free(codec);
+        snd_hda_gen_free(codec);
         return err;
 }
 
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 0792b5725f9c..90ff7a3f72df 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -131,6 +131,13 @@ enum {
 /* Effects values size*/
 #define EFFECT_VALS_MAX_COUNT 12
 
+/* Latency introduced by DSP blocks in milliseconds. */
+#define DSP_CAPTURE_INIT_LATENCY        0
+#define DSP_CRYSTAL_VOICE_LATENCY       124
+#define DSP_PLAYBACK_INIT_LATENCY       13
+#define DSP_PLAY_ENHANCEMENT_LATENCY    30
+#define DSP_SPEAKER_OUT_LATENCY         7
+
 struct ct_effect {
         char name[44];
         hda_nid_t nid;
@@ -741,6 +748,9 @@ struct ca0132_spec {
         long voicefx_val;
         long cur_mic_boost;
 
+        struct hda_codec *codec;
+        struct delayed_work unsol_hp_work;
+
 #ifdef ENABLE_TUNING_CONTROLS
         long cur_ctl_vals[TUNING_CTLS_COUNT];
 #endif
@@ -2740,6 +2750,31 @@ static int ca0132_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
         return 0;
 }
 
+static unsigned int ca0132_playback_pcm_delay(struct hda_pcm_stream *info,
+                        struct hda_codec *codec,
+                        struct snd_pcm_substream *substream)
+{
+        struct ca0132_spec *spec = codec->spec;
+        unsigned int latency = DSP_PLAYBACK_INIT_LATENCY;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+
+        if (spec->dsp_state != DSP_DOWNLOADED)
+                return 0;
+
+        /* Add latency if playback enhancement and either effect is enabled. */
+        if (spec->effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID]) {
+                if ((spec->effects_switch[SURROUND - EFFECT_START_NID]) ||
+                    (spec->effects_switch[DIALOG_PLUS - EFFECT_START_NID]))
+                        latency += DSP_PLAY_ENHANCEMENT_LATENCY;
+        }
+
+        /* Applying Speaker EQ adds latency as well. */
+        if (spec->cur_out_type == SPEAKER_OUT)
+                latency += DSP_SPEAKER_OUT_LATENCY;
+
+        return (latency * runtime->rate) / 1000;
+}
+
 /*
  * Digital out
  */
@@ -2808,6 +2843,23 @@ static int ca0132_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
         return 0;
 }
 
+static unsigned int ca0132_capture_pcm_delay(struct hda_pcm_stream *info,
+                        struct hda_codec *codec,
+                        struct snd_pcm_substream *substream)
+{
+        struct ca0132_spec *spec = codec->spec;
+        unsigned int latency = DSP_CAPTURE_INIT_LATENCY;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+
+        if (spec->dsp_state != DSP_DOWNLOADED)
+                return 0;
+
+        if (spec->effects_switch[CRYSTAL_VOICE - EFFECT_START_NID])
+                latency += DSP_CRYSTAL_VOICE_LATENCY;
+
+        return (latency * runtime->rate) / 1000;
+}
+
 /*
  * Controls stuffs.
  */
@@ -3227,6 +3279,14 @@ exit:
         return err < 0 ? err : 0;
 }
 
+static void ca0132_unsol_hp_delayed(struct work_struct *work)
+{
+        struct ca0132_spec *spec = container_of(
+                to_delayed_work(work), struct ca0132_spec, unsol_hp_work);
+        ca0132_select_out(spec->codec);
+        snd_hda_jack_report_sync(spec->codec);
+}
+
 static void ca0132_set_dmic(struct hda_codec *codec, int enable);
 static int ca0132_mic_boost_set(struct hda_codec *codec, long val);
 static int ca0132_effects_set(struct hda_codec *codec, hda_nid_t nid, long val);
@@ -3991,7 +4051,8 @@ static struct hda_pcm_stream ca0132_pcm_analog_playback = {
         .channels_max = 6,
         .ops = {
                 .prepare = ca0132_playback_pcm_prepare,
-                .cleanup = ca0132_playback_pcm_cleanup
+                .cleanup = ca0132_playback_pcm_cleanup,
+                .get_delay = ca0132_playback_pcm_delay,
         },
 };
 
@@ -4001,7 +4062,8 @@ static struct hda_pcm_stream ca0132_pcm_analog_capture = {
         .channels_max = 2,
         .ops = {
                 .prepare = ca0132_capture_pcm_prepare,
-                .cleanup = ca0132_capture_pcm_cleanup
+                .cleanup = ca0132_capture_pcm_cleanup,
+                .get_delay = ca0132_capture_pcm_delay,
         },
 };
 
@@ -4399,8 +4461,7 @@ static void ca0132_process_dsp_response(struct hda_codec *codec)
 
 static void ca0132_unsol_event(struct hda_codec *codec, unsigned int res)
 {
-        snd_printdd(KERN_INFO "ca0132_unsol_event: 0x%x\n", res);
-
+        struct ca0132_spec *spec = codec->spec;
 
         if (((res >> AC_UNSOL_RES_TAG_SHIFT) & 0x3f) == UNSOL_TAG_DSP) {
                 ca0132_process_dsp_response(codec);
@@ -4412,8 +4473,13 @@ static void ca0132_unsol_event(struct hda_codec *codec, unsigned int res)
 
                 switch (res) {
                 case UNSOL_TAG_HP:
-                        ca0132_select_out(codec);
-                        snd_hda_jack_report_sync(codec);
+                        /* Delay enabling the HP amp, to let the mic-detection
+                         * state machine run.
+                         */
+                        cancel_delayed_work_sync(&spec->unsol_hp_work);
+                        queue_delayed_work(codec->bus->workq,
+                                           &spec->unsol_hp_work,
+                                           msecs_to_jiffies(500));
                         break;
                 case UNSOL_TAG_AMIC1:
                         ca0132_select_mic(codec);
@@ -4588,6 +4654,7 @@ static void ca0132_free(struct hda_codec *codec)
 {
         struct ca0132_spec *spec = codec->spec;
 
+        cancel_delayed_work_sync(&spec->unsol_hp_work);
         snd_hda_power_up(codec);
         snd_hda_sequence_write(codec, spec->base_exit_verbs);
         ca0132_exit_chip(codec);
@@ -4653,6 +4720,7 @@ static int patch_ca0132(struct hda_codec *codec)
         if (!spec)
                 return -ENOMEM;
         codec->spec = spec;
+        spec->codec = codec;
 
         spec->num_mixers = 1;
         spec->mixers[0] = ca0132_mixer;
@@ -4663,6 +4731,8 @@ static int patch_ca0132(struct hda_codec *codec)
         spec->init_verbs[1] = ca0132_init_verbs1;
         spec->num_init_verbs = 2;
 
+        INIT_DELAYED_WORK(&spec->unsol_hp_work, ca0132_unsol_hp_delayed);
+
         ca0132_init_chip(codec);
 
         ca0132_config(codec);
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 0d9c58f13560..bd8d46cca2b3 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -68,6 +68,7 @@ enum {
 enum {
         CS421X_CDB4210,
         CS421X_SENSE_B,
+        CS421X_STUMPY,
 };
 
 /* Vendor-specific processing widget */
@@ -538,6 +539,7 @@ static int patch_cs420x(struct hda_codec *codec)
 /* CS4210 board names */
 static const struct hda_model_fixup cs421x_models[] = {
         { .id = CS421X_CDB4210, .name = "cdb4210" },
+        { .id = CS421X_STUMPY, .name = "stumpy" },
         {}
 };
 
@@ -559,6 +561,17 @@ static const struct hda_pintbl cdb4210_pincfgs[] = {
         {} /* terminator */
 };
 
+/* Stumpy ChromeBox */
+static const struct hda_pintbl stumpy_pincfgs[] = {
+        { 0x05, 0x022120f0 },
+        { 0x06, 0x901700f0 },
+        { 0x07, 0x02a120f0 },
+        { 0x08, 0x77a70037 },
+        { 0x09, 0x77a6003e },
+        { 0x0a, 0x434510f0 },
+        {} /* terminator */
+};
+
 /* Setup GPIO/SENSE for each board (if used) */
 static void cs421x_fixup_sense_b(struct hda_codec *codec,
                                  const struct hda_fixup *fix, int action)
@@ -578,7 +591,11 @@ static const struct hda_fixup cs421x_fixups[] = {
         [CS421X_SENSE_B] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = cs421x_fixup_sense_b,
-        }
+        },
+        [CS421X_STUMPY] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = stumpy_pincfgs,
+        },
 };
 
 static const struct hda_verb cs421x_coef_init_verbs[] = {
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 2a89d1eefeb6..549964395770 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -139,8 +139,12 @@ struct conexant_spec {
 
 
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
-#define set_beep_amp(spec, nid, idx, dir) \
-        ((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir))
+static inline void set_beep_amp(struct conexant_spec *spec, hda_nid_t nid,
+                                int idx, int dir)
+{
+        spec->gen.beep_nid = nid;
+        spec->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir);
+}
 /* additional beep mixers; the actual parameters are overwritten at build */
 static const struct snd_kcontrol_new cxt_beep_mixer[] = {
         HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0, 1, 0, HDA_OUTPUT),
@@ -3191,17 +3195,11 @@ static int cx_auto_build_controls(struct hda_codec *codec)
         return 0;
 }
 
-static void cx_auto_free(struct hda_codec *codec)
-{
-        snd_hda_detach_beep_device(codec);
-        snd_hda_gen_free(codec);
-}
-
 static const struct hda_codec_ops cx_auto_patch_ops = {
         .build_controls = cx_auto_build_controls,
         .build_pcms = snd_hda_gen_build_pcms,
         .init = snd_hda_gen_init,
-        .free = cx_auto_free,
+        .free = snd_hda_gen_free,
         .unsol_event = snd_hda_jack_unsol_event,
 #ifdef CONFIG_PM
         .check_power_status = snd_hda_gen_check_power_status,
@@ -3356,7 +3354,6 @@ static int patch_conexant_auto(struct hda_codec *codec)
         switch (codec->vendor_id) {
         case 0x14f15045:
                 codec->single_adc_amp = 1;
-                codec->power_filter = NULL; /* Needs speaker amp to D3 to avoid click */
                 break;
         case 0x14f15047:
                 codec->pin_amp_workaround = 1;
@@ -3396,8 +3393,6 @@ static int patch_conexant_auto(struct hda_codec *codec)
                 goto error;
 
         codec->patch_ops = cx_auto_patch_ops;
-        if (spec->beep_amp)
-                snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp));
 
         /* Some laptops with Conexant chips show stalls in S3 resume,
          * which falls into the single-cmd mode.
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index de8ac5c07fd0..ede82156da0f 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -44,16 +44,6 @@ static bool static_hdmi_pcm;
 module_param(static_hdmi_pcm, bool, 0644);
 MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info");
 
-/*
- * The HDMI/DisplayPort configuration can be highly dynamic. A graphics device
- * could support N independent pipes, each of them can be connected to one or
- * more ports (DVI, HDMI or DisplayPort).
- *
- * The HDA correspondence of pipes/ports are converter/pin nodes.
- */
-#define MAX_HDMI_CVTS   8
-#define MAX_HDMI_PINS   8
-
 struct hdmi_spec_per_cvt {
         hda_nid_t cvt_nid;
         int assigned;
@@ -80,16 +70,17 @@ struct hdmi_spec_per_pin {
         bool non_pcm;
         bool chmap_set;         /* channel-map override by ALSA API? */
         unsigned char chmap[8]; /* ALSA API channel-map */
+        char pcm_name[8];       /* filled in build_pcm callbacks */
 };
 
 struct hdmi_spec {
         int num_cvts;
-        struct hdmi_spec_per_cvt cvts[MAX_HDMI_CVTS];
-        hda_nid_t cvt_nids[MAX_HDMI_CVTS];
+        struct snd_array cvts; /* struct hdmi_spec_per_cvt */
+        hda_nid_t cvt_nids[4]; /* only for haswell fix */
 
         int num_pins;
-        struct hdmi_spec_per_pin pins[MAX_HDMI_PINS];
-        struct hda_pcm pcm_rec[MAX_HDMI_PINS];
+        struct snd_array pins; /* struct hdmi_spec_per_pin */
+        struct snd_array pcm_rec; /* struct hda_pcm */
         unsigned int channels_max; /* max over all cvts */
 
         struct hdmi_eld temp_eld;
@@ -304,12 +295,19 @@ static struct cea_channel_speaker_allocation channel_allocations[] = {
  * HDMI routines
  */
 
+#define get_pin(spec, idx) \
+        ((struct hdmi_spec_per_pin *)snd_array_elem(&spec->pins, idx))
+#define get_cvt(spec, idx) \
+        ((struct hdmi_spec_per_cvt  *)snd_array_elem(&spec->cvts, idx))
+#define get_pcm_rec(spec, idx) \
+        ((struct hda_pcm *)snd_array_elem(&spec->pcm_rec, idx))
+
 static int pin_nid_to_pin_index(struct hdmi_spec *spec, hda_nid_t pin_nid)
 {
         int pin_idx;
 
         for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++)
-                if (spec->pins[pin_idx].pin_nid == pin_nid)
+                if (get_pin(spec, pin_idx)->pin_nid == pin_nid)
                         return pin_idx;
 
         snd_printk(KERN_WARNING "HDMI: pin nid %d not registered\n", pin_nid);
@@ -322,7 +320,7 @@ static int hinfo_to_pin_index(struct hdmi_spec *spec,
         int pin_idx;
 
         for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++)
-                if (&spec->pcm_rec[pin_idx].stream[0] == hinfo)
+                if (get_pcm_rec(spec, pin_idx)->stream == hinfo)
                         return pin_idx;
 
         snd_printk(KERN_WARNING "HDMI: hinfo %p not registered\n", hinfo);
@@ -334,7 +332,7 @@ static int cvt_nid_to_cvt_index(struct hdmi_spec *spec, hda_nid_t cvt_nid)
         int cvt_idx;
 
         for (cvt_idx = 0; cvt_idx < spec->num_cvts; cvt_idx++)
-                if (spec->cvts[cvt_idx].cvt_nid == cvt_nid)
+                if (get_cvt(spec, cvt_idx)->cvt_nid == cvt_nid)
                         return cvt_idx;
 
         snd_printk(KERN_WARNING "HDMI: cvt nid %d not registered\n", cvt_nid);
@@ -352,7 +350,7 @@ static int hdmi_eld_ctl_info(struct snd_kcontrol *kcontrol,
         uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
 
         pin_idx = kcontrol->private_value;
-        eld = &spec->pins[pin_idx].sink_eld;
+        eld = &get_pin(spec, pin_idx)->sink_eld;
 
         mutex_lock(&eld->lock);
         uinfo->count = eld->eld_valid ? eld->eld_size : 0;
@@ -370,7 +368,7 @@ static int hdmi_eld_ctl_get(struct snd_kcontrol *kcontrol,
         int pin_idx;
 
         pin_idx = kcontrol->private_value;
-        eld = &spec->pins[pin_idx].sink_eld;
+        eld = &get_pin(spec, pin_idx)->sink_eld;
 
         mutex_lock(&eld->lock);
         if (eld->eld_size > ARRAY_SIZE(ucontrol->value.bytes.data)) {
@@ -410,11 +408,11 @@ static int hdmi_create_eld_ctl(struct hda_codec *codec, int pin_idx,
         kctl->private_value = pin_idx;
         kctl->id.device = device;
 
-        err = snd_hda_ctl_add(codec, spec->pins[pin_idx].pin_nid, kctl);
+        err = snd_hda_ctl_add(codec, get_pin(spec, pin_idx)->pin_nid, kctl);
         if (err < 0)
                 return err;
 
-        spec->pins[pin_idx].eld_ctl = kctl;
+        get_pin(spec, pin_idx)->eld_ctl = kctl;
         return 0;
 }
 
@@ -875,14 +873,14 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx,
                                        struct snd_pcm_substream *substream)
 {
         struct hdmi_spec *spec = codec->spec;
-        struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx];
+        struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
         hda_nid_t pin_nid = per_pin->pin_nid;
         int channels = substream->runtime->channels;
         struct hdmi_eld *eld;
         int ca;
         union audio_infoframe ai;
 
-        eld = &spec->pins[pin_idx].sink_eld;
+        eld = &per_pin->sink_eld;
         if (!eld->monitor_present)
                 return;
 
@@ -977,7 +975,7 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
         if (pin_idx < 0)
                 return;
 
-        hdmi_present_sense(&spec->pins[pin_idx], 1);
+        hdmi_present_sense(get_pin(spec, pin_idx), 1);
         snd_hda_jack_report_sync(codec);
 }
 
@@ -1083,12 +1081,12 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
         pin_idx = hinfo_to_pin_index(spec, hinfo);
         if (snd_BUG_ON(pin_idx < 0))
                 return -EINVAL;
-        per_pin = &spec->pins[pin_idx];
+        per_pin = get_pin(spec, pin_idx);
         eld = &per_pin->sink_eld;
 
         /* Dynamically assign converter to stream */
         for (cvt_idx = 0; cvt_idx < spec->num_cvts; cvt_idx++) {
-                per_cvt = &spec->cvts[cvt_idx];
+                per_cvt = get_cvt(spec, cvt_idx);
 
                 /* Must not already be assigned */
                 if (per_cvt->assigned)
@@ -1151,7 +1149,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
 static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx)
 {
         struct hdmi_spec *spec = codec->spec;
-        struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx];
+        struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
         hda_nid_t pin_nid = per_pin->pin_nid;
 
         if (!(get_wcaps(codec, pin_nid) & AC_WCAP_CONN_LIST)) {
@@ -1275,14 +1273,13 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
         if (get_defcfg_connect(config) == AC_JACK_PORT_NONE)
                 return 0;
 
-        if (snd_BUG_ON(spec->num_pins >= MAX_HDMI_PINS))
-                return -E2BIG;
-
         if (codec->vendor_id == 0x80862807)
                 intel_haswell_fixup_connect_list(codec, pin_nid);
 
         pin_idx = spec->num_pins;
-        per_pin = &spec->pins[pin_idx];
+        per_pin = snd_array_new(&spec->pins);
+        if (!per_pin)
+                return -ENOMEM;
 
         per_pin->pin_nid = pin_nid;
         per_pin->non_pcm = false;
@@ -1299,19 +1296,16 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
 static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
 {
         struct hdmi_spec *spec = codec->spec;
-        int cvt_idx;
         struct hdmi_spec_per_cvt *per_cvt;
         unsigned int chans;
         int err;
 
-        if (snd_BUG_ON(spec->num_cvts >= MAX_HDMI_CVTS))
-                return -E2BIG;
-
         chans = get_wcaps(codec, cvt_nid);
         chans = get_wcaps_channels(chans);
 
-        cvt_idx = spec->num_cvts;
-        per_cvt = &spec->cvts[cvt_idx];
+        per_cvt = snd_array_new(&spec->cvts);
+        if (!per_cvt)
+                return -ENOMEM;
 
         per_cvt->cvt_nid = cvt_nid;
         per_cvt->channels_min = 2;
@@ -1328,7 +1322,9 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
         if (err < 0)
                 return err;
 
-        spec->cvt_nids[spec->num_cvts++] = cvt_nid;
+        if (spec->num_cvts < ARRAY_SIZE(spec->cvt_nids))
+                spec->cvt_nids[spec->num_cvts] = cvt_nid;
+        spec->num_cvts++;
 
         return 0;
 }
@@ -1384,13 +1380,6 @@ static int hdmi_parse_codec(struct hda_codec *codec)
 
 /*
  */
-static char *get_hdmi_pcm_name(int idx)
-{
-        static char names[MAX_HDMI_PINS][8];
-        sprintf(&names[idx][0], "HDMI %d", idx);
-        return &names[idx][0];
-}
-
 static bool check_non_pcm_per_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
 {
         struct hda_spdif_out *spdif;
@@ -1417,7 +1406,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
         hda_nid_t cvt_nid = hinfo->nid;
         struct hdmi_spec *spec = codec->spec;
         int pin_idx = hinfo_to_pin_index(spec, hinfo);
-        hda_nid_t pin_nid = spec->pins[pin_idx].pin_nid;
+        hda_nid_t pin_nid = get_pin(spec, pin_idx)->pin_nid;
         bool non_pcm;
 
         non_pcm = check_non_pcm_per_cvt(codec, cvt_nid);
@@ -1450,7 +1439,7 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
                 cvt_idx = cvt_nid_to_cvt_index(spec, hinfo->nid);
                 if (snd_BUG_ON(cvt_idx < 0))
                         return -EINVAL;
-                per_cvt = &spec->cvts[cvt_idx];
+                per_cvt = get_cvt(spec, cvt_idx);
 
                 snd_BUG_ON(!per_cvt->assigned);
                 per_cvt->assigned = 0;
@@ -1459,7 +1448,7 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
                 pin_idx = hinfo_to_pin_index(spec, hinfo);
                 if (snd_BUG_ON(pin_idx < 0))
                         return -EINVAL;
-                per_pin = &spec->pins[pin_idx];
+                per_pin = get_pin(spec, pin_idx);
 
                 snd_hda_spdif_ctls_unassign(codec, pin_idx);
                 per_pin->chmap_set = false;
@@ -1553,7 +1542,7 @@ static int hdmi_chmap_ctl_get(struct snd_kcontrol *kcontrol,
         struct hda_codec *codec = info->private_data;
         struct hdmi_spec *spec = codec->spec;
         int pin_idx = kcontrol->private_value;
-        struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx];
+        struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
         int i;
 
         for (i = 0; i < ARRAY_SIZE(per_pin->chmap); i++)
@@ -1568,7 +1557,7 @@ static int hdmi_chmap_ctl_put(struct snd_kcontrol *kcontrol,
         struct hda_codec *codec = info->private_data;
         struct hdmi_spec *spec = codec->spec;
         int pin_idx = kcontrol->private_value;
-        struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx];
+        struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
         unsigned int ctl_idx;
         struct snd_pcm_substream *substream;
         unsigned char chmap[8];
@@ -1613,9 +1602,14 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec)
         for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
                 struct hda_pcm *info;
                 struct hda_pcm_stream *pstr;
-
-                info = &spec->pcm_rec[pin_idx];
-                info->name = get_hdmi_pcm_name(pin_idx);
+                struct hdmi_spec_per_pin *per_pin;
+
+                per_pin = get_pin(spec, pin_idx);
+                sprintf(per_pin->pcm_name, "HDMI %d", pin_idx);
+                info = snd_array_new(&spec->pcm_rec);
+                if (!info)
+                        return -ENOMEM;
+                info->name = per_pin->pcm_name;
                 info->pcm_type = HDA_PCM_TYPE_HDMI;
                 info->own_chmap = true;
 
@@ -1626,7 +1620,7 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec)
         }
 
         codec->num_pcms = spec->num_pins;
-        codec->pcm_info = spec->pcm_rec;
+        codec->pcm_info = spec->pcm_rec.list;
 
         return 0;
 }
@@ -1635,8 +1629,8 @@ static int generic_hdmi_build_jack(struct hda_codec *codec, int pin_idx)
 {
         char hdmi_str[32] = "HDMI/DP";
         struct hdmi_spec *spec = codec->spec;
-        struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx];
-        int pcmdev = spec->pcm_rec[pin_idx].device;
+        struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
+        int pcmdev = get_pcm_rec(spec, pin_idx)->device;
 
         if (pcmdev > 0)
                 sprintf(hdmi_str + strlen(hdmi_str), ",pcm=%d", pcmdev);
@@ -1654,7 +1648,7 @@ static int generic_hdmi_build_controls(struct hda_codec *codec)
         int pin_idx;
 
         for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
-                struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx];
+                struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
 
                 err = generic_hdmi_build_jack(codec, pin_idx);
                 if (err < 0)
@@ -1669,9 +1663,8 @@ static int generic_hdmi_build_controls(struct hda_codec *codec)
                 snd_hda_spdif_ctls_unassign(codec, pin_idx);
 
                 /* add control for ELD Bytes */
-                err = hdmi_create_eld_ctl(codec,
-                                        pin_idx,
-                                        spec->pcm_rec[pin_idx].device);
+                err = hdmi_create_eld_ctl(codec, pin_idx,
+                                          get_pcm_rec(spec, pin_idx)->device);
 
                 if (err < 0)
                         return err;
@@ -1709,7 +1702,7 @@ static int generic_hdmi_init_per_pins(struct hda_codec *codec)
         int pin_idx;
 
         for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
-                struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx];
+                struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
                 struct hdmi_eld *eld = &per_pin->sink_eld;
 
                 per_pin->codec = codec;
@@ -1726,7 +1719,7 @@ static int generic_hdmi_init(struct hda_codec *codec)
         int pin_idx;
 
         for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
-                struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx];
+                struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
                 hda_nid_t pin_nid = per_pin->pin_nid;
 
                 hdmi_init_pin(codec, pin_nid);
@@ -1735,13 +1728,27 @@ static int generic_hdmi_init(struct hda_codec *codec)
         return 0;
 }
 
+static void hdmi_array_init(struct hdmi_spec *spec, int nums)
+{
+        snd_array_init(&spec->pins, sizeof(struct hdmi_spec_per_pin), nums);
+        snd_array_init(&spec->cvts, sizeof(struct hdmi_spec_per_cvt), nums);
+        snd_array_init(&spec->pcm_rec, sizeof(struct hda_pcm), nums);
+}
+
+static void hdmi_array_free(struct hdmi_spec *spec)
+{
+        snd_array_free(&spec->pins);
+        snd_array_free(&spec->cvts);
+        snd_array_free(&spec->pcm_rec);
+}
+
 static void generic_hdmi_free(struct hda_codec *codec)
 {
         struct hdmi_spec *spec = codec->spec;
         int pin_idx;
 
         for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
-                struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx];
+                struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
                 struct hdmi_eld *eld = &per_pin->sink_eld;
 
                 cancel_delayed_work(&per_pin->work);
@@ -1749,6 +1756,7 @@ static void generic_hdmi_free(struct hda_codec *codec)
         }
 
         flush_workqueue(codec->bus->workq);
+        hdmi_array_free(spec);
         kfree(spec);
 }
 
@@ -1775,6 +1783,7 @@ static void intel_haswell_fixup_connect_list(struct hda_codec *codec,
 
         /* override pins connection list */
         snd_printdd("hdmi: haswell: override pin connection 0x%x\n", nid);
+        nconns = max(spec->num_cvts, 4);
         snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids);
 }
 
@@ -1855,6 +1864,7 @@ static int patch_generic_hdmi(struct hda_codec *codec)
                 return -ENOMEM;
 
         codec->spec = spec;
+        hdmi_array_init(spec, 4);
 
         snd_hda_pick_fixup(codec, hdmi_models, hdmi_fixup_tbl, hdmi_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -1882,24 +1892,30 @@ static int patch_generic_hdmi(struct hda_codec *codec)
 static int simple_playback_build_pcms(struct hda_codec *codec)
 {
         struct hdmi_spec *spec = codec->spec;
-        struct hda_pcm *info = spec->pcm_rec;
+        struct hda_pcm *info;
         unsigned int chans;
         struct hda_pcm_stream *pstr;
+        struct hdmi_spec_per_cvt *per_cvt;
 
-        codec->num_pcms = 1;
-        codec->pcm_info = info;
-
-        chans = get_wcaps(codec, spec->cvts[0].cvt_nid);
+        per_cvt = get_cvt(spec, 0);
+        chans = get_wcaps(codec, per_cvt->cvt_nid);
         chans = get_wcaps_channels(chans);
 
-        info->name = get_hdmi_pcm_name(0);
+        info = snd_array_new(&spec->pcm_rec);
+        if (!info)
+                return -ENOMEM;
+        info->name = get_pin(spec, 0)->pcm_name;
+        sprintf(info->name, "HDMI 0");
         info->pcm_type = HDA_PCM_TYPE_HDMI;
         pstr = &info->stream[SNDRV_PCM_STREAM_PLAYBACK];
         *pstr = spec->pcm_playback;
-        pstr->nid = spec->cvts[0].cvt_nid;
+        pstr->nid = per_cvt->cvt_nid;
         if (pstr->channels_max <= 2 && chans && chans <= 16)
                 pstr->channels_max = chans;
 
+        codec->num_pcms = 1;
+        codec->pcm_info = info;
+
         return 0;
 }
 
@@ -1919,11 +1935,12 @@ static void simple_hdmi_unsol_event(struct hda_codec *codec,
 static int simple_playback_build_controls(struct hda_codec *codec)
 {
         struct hdmi_spec *spec = codec->spec;
+        struct hdmi_spec_per_cvt *per_cvt;
         int err;
 
-        err = snd_hda_create_spdif_out_ctls(codec,
-                                            spec->cvts[0].cvt_nid,
-                                            spec->cvts[0].cvt_nid);
+        per_cvt = get_cvt(spec, 0);
+        err = snd_hda_create_spdif_out_ctls(codec, per_cvt->cvt_nid,
+                                            per_cvt->cvt_nid);
         if (err < 0)
                 return err;
         return simple_hdmi_build_jack(codec, 0);
@@ -1932,7 +1949,8 @@ static int simple_playback_build_controls(struct hda_codec *codec)
 static int simple_playback_init(struct hda_codec *codec)
 {
         struct hdmi_spec *spec = codec->spec;
-        hda_nid_t pin = spec->pins[0].pin_nid;
+        struct hdmi_spec_per_pin *per_pin = get_pin(spec, 0);
+        hda_nid_t pin = per_pin->pin_nid;
 
         snd_hda_codec_write(codec, pin, 0,
                             AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
@@ -1948,6 +1966,7 @@ static void simple_playback_free(struct hda_codec *codec)
 {
         struct hdmi_spec *spec = codec->spec;
 
+        hdmi_array_free(spec);
         kfree(spec);
 }
 
@@ -2111,20 +2130,29 @@ static int patch_simple_hdmi(struct hda_codec *codec,
                              hda_nid_t cvt_nid, hda_nid_t pin_nid)
 {
         struct hdmi_spec *spec;
+        struct hdmi_spec_per_cvt *per_cvt;
+        struct hdmi_spec_per_pin *per_pin;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (!spec)
                 return -ENOMEM;
 
         codec->spec = spec;
+        hdmi_array_init(spec, 1);
 
         spec->multiout.num_dacs = 0;  /* no analog */
         spec->multiout.max_channels = 2;
         spec->multiout.dig_out_nid = cvt_nid;
         spec->num_cvts = 1;
         spec->num_pins = 1;
-        spec->cvts[0].cvt_nid = cvt_nid;
-        spec->pins[0].pin_nid = pin_nid;
+        per_pin = snd_array_new(&spec->pins);
+        per_cvt = snd_array_new(&spec->cvts);
+        if (!per_pin || !per_cvt) {
+                simple_playback_free(codec);
+                return -ENOMEM;
+        }
+        per_cvt->cvt_nid = cvt_nid;
+        per_pin->pin_nid = pin_nid;
         spec->pcm_playback = simple_pcm_playback;
 
         codec->patch_ops = simple_hdmi_patch_ops;
@@ -2201,9 +2229,11 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
         int i;
         struct hdmi_spec *spec = codec->spec;
         struct hda_spdif_out *spdif;
+        struct hdmi_spec_per_cvt *per_cvt;
 
         mutex_lock(&codec->spdif_mutex);
-        spdif = snd_hda_spdif_out_of_nid(codec, spec->cvts[0].cvt_nid);
+        per_cvt = get_cvt(spec, 0);
+        spdif = snd_hda_spdif_out_of_nid(codec, per_cvt->cvt_nid);
 
         chs = substream->runtime->channels;
 
@@ -2325,13 +2355,17 @@ static int nvhdmi_7x_8ch_build_pcms(struct hda_codec *codec)
 {
         struct hdmi_spec *spec = codec->spec;
         int err = simple_playback_build_pcms(codec);
-        spec->pcm_rec[0].own_chmap = true;
+        if (!err) {
+                struct hda_pcm *info = get_pcm_rec(spec, 0);
+                info->own_chmap = true;
+        }
         return err;
 }
 
 static int nvhdmi_7x_8ch_build_controls(struct hda_codec *codec)
 {
         struct hdmi_spec *spec = codec->spec;
+        struct hda_pcm *info;
         struct snd_pcm_chmap *chmap;
         int err;
 
@@ -2340,7 +2374,8 @@ static int nvhdmi_7x_8ch_build_controls(struct hda_codec *codec)
                 return err;
 
         /* add channel maps */
-        err = snd_pcm_add_chmap_ctls(spec->pcm_rec[0].pcm,
+        info = get_pcm_rec(spec, 0);
+        err = snd_pcm_add_chmap_ctls(info->pcm,
                                      SNDRV_PCM_STREAM_PLAYBACK,
                                      snd_pcm_alt_chmaps, 8, 0, &chmap);
         if (err < 0)
@@ -2395,6 +2430,7 @@ static int atihdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
                                         struct snd_pcm_substream *substream)
 {
         struct hdmi_spec *spec = codec->spec;
+        struct hdmi_spec_per_cvt *per_cvt = get_cvt(spec, 0);
         int chans = substream->runtime->channels;
         int i, err;
 
@@ -2402,11 +2438,11 @@ static int atihdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
                                           substream);
         if (err < 0)
                 return err;
-        snd_hda_codec_write(codec, spec->cvts[0].cvt_nid, 0,
+        snd_hda_codec_write(codec, per_cvt->cvt_nid, 0,
                             AC_VERB_SET_CVT_CHAN_COUNT, chans - 1);
         /* FIXME: XXX */
         for (i = 0; i < chans; i++) {
-                snd_hda_codec_write(codec, spec->cvts[0].cvt_nid, 0,
+                snd_hda_codec_write(codec, per_cvt->cvt_nid, 0,
                                     AC_VERB_SET_HDMI_CHAN_SLOT,
                                     (i << 4) | i);
         }
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f15c36bde540..74bf5f6595b9 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -34,7 +34,6 @@
 #include "hda_codec.h"
 #include "hda_local.h"
 #include "hda_auto_parser.h"
-#include "hda_beep.h"
 #include "hda_jack.h"
 #include "hda_generic.h"
 
@@ -53,6 +52,20 @@ enum {
         ALC_INIT_GPIO3,
 };
 
+enum {
+        ALC_HEADSET_MODE_UNKNOWN,
+        ALC_HEADSET_MODE_UNPLUGGED,
+        ALC_HEADSET_MODE_HEADSET,
+        ALC_HEADSET_MODE_MIC,
+        ALC_HEADSET_MODE_HEADPHONE,
+};
+
+enum {
+        ALC_HEADSET_TYPE_UNKNOWN,
+        ALC_HEADSET_TYPE_CTIA,
+        ALC_HEADSET_TYPE_OMTP,
+};
+
 struct alc_customize_define {
         unsigned int  sku_cfg;
         unsigned char port_connectivity;
@@ -86,6 +99,13 @@ struct alc_spec {
         int mute_led_polarity;
         hda_nid_t mute_led_nid;
 
+        unsigned int gpio_led; /* used for alc269_fixup_hp_gpio_led() */
+
+        hda_nid_t headset_mic_pin;
+        hda_nid_t headphone_mic_pin;
+        int current_headset_mode;
+        int current_headset_type;
+
         /* hooks */
         void (*init_hook)(struct hda_codec *codec);
 #ifdef CONFIG_PM
@@ -805,17 +825,7 @@ static inline void alc_shutup(struct hda_codec *codec)
         snd_hda_shutup_pins(codec);
 }
 
-static void alc_free(struct hda_codec *codec)
-{
-        struct alc_spec *spec = codec->spec;
-
-        if (!spec)
-                return;
-
-        snd_hda_gen_spec_free(&spec->gen);
-        snd_hda_detach_beep_device(codec);
-        kfree(spec);
-}
+#define alc_free        snd_hda_gen_free
 
 #ifdef CONFIG_PM
 static void alc_power_eapd(struct hda_codec *codec)
@@ -1401,6 +1411,7 @@ static int patch_alc880(struct hda_codec *codec)
 
         spec = codec->spec;
         spec->gen.need_dac_fix = 1;
+        spec->gen.beep_nid = 0x01;
 
         snd_hda_pick_fixup(codec, alc880_fixup_models, alc880_fixup_tbl,
                        alc880_fixups);
@@ -1411,12 +1422,8 @@ static int patch_alc880(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog)
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
         codec->patch_ops.unsol_event = alc880_unsol_event;
@@ -1455,6 +1462,7 @@ enum {
         ALC260_FIXUP_HP_B1900,
         ALC260_FIXUP_KN1,
         ALC260_FIXUP_FSC_S7020,
+        ALC260_FIXUP_FSC_S7020_JWSE,
 };
 
 static void alc260_gpio1_automute(struct hda_codec *codec)
@@ -1516,14 +1524,17 @@ static void alc260_fixup_fsc_s7020(struct hda_codec *codec,
                                    const struct hda_fixup *fix, int action)
 {
         struct alc_spec *spec = codec->spec;
-
-        switch (action) {
-        case HDA_FIXUP_ACT_PRE_PROBE:
-                spec->gen.add_out_jack_modes = 1;
-                break;
-        case HDA_FIXUP_ACT_PROBE:
+        if (action == HDA_FIXUP_ACT_PROBE)
                 spec->init_amp = ALC_INIT_NONE;
-                break;
+}
+
+static void alc260_fixup_fsc_s7020_jwse(struct hda_codec *codec,
+                                   const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                spec->gen.add_jack_modes = 1;
+                spec->gen.hp_mic = 1;
         }
 }
 
@@ -1586,6 +1597,12 @@ static const struct hda_fixup alc260_fixups[] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc260_fixup_fsc_s7020,
         },
+        [ALC260_FIXUP_FSC_S7020_JWSE] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc260_fixup_fsc_s7020_jwse,
+                .chained = true,
+                .chain_id = ALC260_FIXUP_FSC_S7020,
+        },
 };
 
 static const struct snd_pci_quirk alc260_fixup_tbl[] = {
@@ -1602,6 +1619,14 @@ static const struct snd_pci_quirk alc260_fixup_tbl[] = {
         {}
 };
 
+static const struct hda_model_fixup alc260_fixup_models[] = {
+        {.id = ALC260_FIXUP_GPIO1, .name = "gpio1"},
+        {.id = ALC260_FIXUP_COEF, .name = "coef"},
+        {.id = ALC260_FIXUP_FSC_S7020, .name = "fujitsu"},
+        {.id = ALC260_FIXUP_FSC_S7020_JWSE, .name = "fujitsu-jwse"},
+        {}
+};
+
 /*
  */
 static int patch_alc260(struct hda_codec *codec)
@@ -1619,8 +1644,10 @@ static int patch_alc260(struct hda_codec *codec)
          * it's almost harmless.
          */
         spec->gen.prefer_hp_amp = 1;
+        spec->gen.beep_nid = 0x01;
 
-        snd_hda_pick_fixup(codec, NULL, alc260_fixup_tbl, alc260_fixups);
+        snd_hda_pick_fixup(codec, alc260_fixup_models, alc260_fixup_tbl,
+                           alc260_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
         /* automatic parse from the BIOS config */
@@ -1628,12 +1655,8 @@ static int patch_alc260(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog)
                 set_beep_amp(spec, 0x07, 0x05, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
         spec->shutup = alc_eapd_shutup;
@@ -2132,17 +2155,16 @@ static int patch_alc882(struct hda_codec *codec)
 
         alc_auto_parse_customize_define(codec);
 
+        if (has_cdefine_beep(codec))
+                spec->gen.beep_nid = 0x01;
+
         /* automatic parse from the BIOS config */
         err = alc882_parse_auto_config(codec);
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog && spec->gen.beep_nid)
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
 
@@ -2295,17 +2317,16 @@ static int patch_alc262(struct hda_codec *codec)
 
         alc_auto_parse_customize_define(codec);
 
+        if (has_cdefine_beep(codec))
+                spec->gen.beep_nid = 0x01;
+
         /* automatic parse from the BIOS config */
         err = alc262_parse_auto_config(codec);
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog && spec->gen.beep_nid)
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
         spec->shutup = alc_eapd_shutup;
@@ -2386,16 +2407,7 @@ static const struct snd_pci_quirk alc268_fixup_tbl[] = {
 static int alc268_parse_auto_config(struct hda_codec *codec)
 {
         static const hda_nid_t alc268_ssids[] = { 0x15, 0x1b, 0x14, 0 };
-        struct alc_spec *spec = codec->spec;
-        int err = alc_parse_auto_config(codec, NULL, alc268_ssids);
-        if (err > 0) {
-                if (!spec->gen.no_analog &&
-                    spec->gen.autocfg.speaker_pins[0] != 0x1d) {
-                        add_mixer(spec, alc268_beep_mixer);
-                        snd_hda_add_verbs(codec, alc268_beep_init_verbs);
-                }
-        }
-        return err;
+        return alc_parse_auto_config(codec, NULL, alc268_ssids);
 }
 
 /*
@@ -2403,7 +2415,7 @@ static int alc268_parse_auto_config(struct hda_codec *codec)
 static int patch_alc268(struct hda_codec *codec)
 {
         struct alc_spec *spec;
-        int i, has_beep, err;
+        int err;
 
         /* ALC268 has no aa-loopback mixer */
         err = alc_alloc_spec(codec, 0);
@@ -2411,6 +2423,7 @@ static int patch_alc268(struct hda_codec *codec)
                 return err;
 
         spec = codec->spec;
+        spec->gen.beep_nid = 0x01;
 
         snd_hda_pick_fixup(codec, alc268_fixup_models, alc268_fixup_tbl, alc268_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -2420,18 +2433,10 @@ static int patch_alc268(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        has_beep = 0;
-        for (i = 0; i < spec->num_mixers; i++) {
-                if (spec->mixers[i] == alc268_beep_mixer) {
-                        has_beep = 1;
-                        break;
-                }
-        }
-
-        if (has_beep) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (err > 0 && !spec->gen.no_analog &&
+            spec->gen.autocfg.speaker_pins[0] != 0x1d) {
+                add_mixer(spec, alc268_beep_mixer);
+                snd_hda_add_verbs(codec, alc268_beep_init_verbs);
                 if (!query_amp_caps(codec, 0x1d, HDA_INPUT))
                         /* override the amp caps for beep generator */
                         snd_hda_override_amp_caps(codec, 0x1d, HDA_INPUT,
@@ -2631,7 +2636,8 @@ static void alc271_fixup_dmic(struct hda_codec *codec,
         };
         unsigned int cfg;
 
-        if (strcmp(codec->chip_name, "ALC271X"))
+        if (strcmp(codec->chip_name, "ALC271X") &&
+            strcmp(codec->chip_name, "ALC269VB"))
                 return;
         cfg = snd_hda_codec_get_pincfg(codec, 0x12);
         if (get_defcfg_connect(cfg) == AC_JACK_PORT_FIXED)
@@ -2693,6 +2699,34 @@ static void alc269_fixup_quanta_mute(struct hda_codec *codec,
         spec->gen.automute_hook = alc269_quanta_automute;
 }
 
+static void alc269_x101_hp_automute_hook(struct hda_codec *codec,
+                                         struct hda_jack_tbl *jack)
+{
+        struct alc_spec *spec = codec->spec;
+        int vref;
+        msleep(200);
+        snd_hda_gen_hp_automute(codec, jack);
+
+        vref = spec->gen.hp_jack_present ? PIN_VREF80 : 0;
+        msleep(100);
+        snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                            vref);
+        msleep(500);
+        snd_hda_codec_write(codec, 0x18, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+                            vref);
+}
+
+static void alc269_fixup_x101_headset_mic(struct hda_codec *codec,
+                                     const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                spec->parse_flags |= HDA_PINCFG_HEADSET_MIC;
+                spec->gen.hp_automute_hook = alc269_x101_hp_automute_hook;
+        }
+}
+
+
 /* update mute-LED according to the speaker mute state via mic VREF pin */
 static void alc269_fixup_mic_mute_hook(void *private_data, int enabled)
 {
@@ -2757,6 +2791,356 @@ static void alc269_fixup_hp_mute_led_mic2(struct hda_codec *codec,
         }
 }
 
+/* turn on/off mute LED per vmaster hook */
+static void alc269_fixup_hp_gpio_mute_hook(void *private_data, int enabled)
+{
+        struct hda_codec *codec = private_data;
+        struct alc_spec *spec = codec->spec;
+        unsigned int oldval = spec->gpio_led;
+
+        if (enabled)
+                spec->gpio_led &= ~0x08;
+        else
+                spec->gpio_led |= 0x08;
+        if (spec->gpio_led != oldval)
+                snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,
+                                    spec->gpio_led);
+}
+
+/* turn on/off mic-mute LED per capture hook */
+static void alc269_fixup_hp_gpio_mic_mute_hook(struct hda_codec *codec,
+                               struct snd_ctl_elem_value *ucontrol)
+{
+        struct alc_spec *spec = codec->spec;
+        unsigned int oldval = spec->gpio_led;
+
+        if (!ucontrol)
+                return;
+
+        if (ucontrol->value.integer.value[0] ||
+            ucontrol->value.integer.value[1])
+                spec->gpio_led &= ~0x10;
+        else
+                spec->gpio_led |= 0x10;
+        if (spec->gpio_led != oldval)
+                snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,
+                                    spec->gpio_led);
+}
+
+static void alc269_fixup_hp_gpio_led(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        static const struct hda_verb gpio_init[] = {
+                { 0x01, AC_VERB_SET_GPIO_MASK, 0x18 },
+                { 0x01, AC_VERB_SET_GPIO_DIRECTION, 0x18 },
+                {}
+        };
+
+        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                spec->gen.vmaster_mute.hook = alc269_fixup_hp_gpio_mute_hook;
+                spec->gen.cap_sync_hook = alc269_fixup_hp_gpio_mic_mute_hook;
+                spec->gpio_led = 0;
+                snd_hda_add_verbs(codec, gpio_init);
+        }
+}
+
+static void alc_headset_mode_unplugged(struct hda_codec *codec)
+{
+        int val;
+
+        switch (codec->vendor_id) {
+        case 0x10ec0283:
+                alc_write_coef_idx(codec, 0x1b, 0x0c0b);
+                alc_write_coef_idx(codec, 0x45, 0xc429);
+                val = alc_read_coef_idx(codec, 0x35);
+                alc_write_coef_idx(codec, 0x35, val & 0xbfff);
+                alc_write_coef_idx(codec, 0x06, 0x2104);
+                alc_write_coef_idx(codec, 0x1a, 0x0001);
+                alc_write_coef_idx(codec, 0x26, 0x0004);
+                alc_write_coef_idx(codec, 0x32, 0x42a3);
+                break;
+        case 0x10ec0292:
+                alc_write_coef_idx(codec, 0x76, 0x000e);
+                alc_write_coef_idx(codec, 0x6c, 0x2400);
+                alc_write_coef_idx(codec, 0x18, 0x7308);
+                alc_write_coef_idx(codec, 0x6b, 0xc429);
+                break;
+        case 0x10ec0668:
+                alc_write_coef_idx(codec, 0x15, 0x0d40);
+                alc_write_coef_idx(codec, 0xb7, 0x802b);
+                break;
+        }
+        snd_printdd("Headset jack set to unplugged mode.\n");
+}
+
+
+static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
+                                    hda_nid_t mic_pin)
+{
+        int val;
+
+        switch (codec->vendor_id) {
+        case 0x10ec0283:
+                alc_write_coef_idx(codec, 0x45, 0xc429);
+                snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
+                val = alc_read_coef_idx(codec, 0x35);
+                alc_write_coef_idx(codec, 0x35, val | 1<<14);
+                alc_write_coef_idx(codec, 0x06, 0x2100);
+                alc_write_coef_idx(codec, 0x1a, 0x0021);
+                alc_write_coef_idx(codec, 0x26, 0x008c);
+                snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);
+                break;
+        case 0x10ec0292:
+                snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
+                alc_write_coef_idx(codec, 0x19, 0xa208);
+                alc_write_coef_idx(codec, 0x2e, 0xacf0);
+                break;
+        case 0x10ec0668:
+                alc_write_coef_idx(codec, 0x11, 0x0001);
+                snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
+                alc_write_coef_idx(codec, 0xb7, 0x802b);
+                alc_write_coef_idx(codec, 0xb5, 0x1040);
+                val = alc_read_coef_idx(codec, 0xc3);
+                alc_write_coef_idx(codec, 0xc3, val | 1<<12);
+                snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);
+                break;
+        }
+        snd_printdd("Headset jack set to mic-in mode.\n");
+}
+
+static void alc_headset_mode_default(struct hda_codec *codec)
+{
+        switch (codec->vendor_id) {
+        case 0x10ec0283:
+                alc_write_coef_idx(codec, 0x06, 0x2100);
+                alc_write_coef_idx(codec, 0x32, 0x4ea3);
+                break;
+        case 0x10ec0292:
+                alc_write_coef_idx(codec, 0x76, 0x000e);
+                alc_write_coef_idx(codec, 0x6c, 0x2400);
+                alc_write_coef_idx(codec, 0x6b, 0xc429);
+                alc_write_coef_idx(codec, 0x18, 0x7308);
+                break;
+        case 0x10ec0668:
+                alc_write_coef_idx(codec, 0x11, 0x0041);
+                alc_write_coef_idx(codec, 0x15, 0x0d40);
+                alc_write_coef_idx(codec, 0xb7, 0x802b);
+                break;
+        }
+        snd_printdd("Headset jack set to headphone (default) mode.\n");
+}
+
+/* Iphone type */
+static void alc_headset_mode_ctia(struct hda_codec *codec)
+{
+        switch (codec->vendor_id) {
+        case 0x10ec0283:
+                alc_write_coef_idx(codec, 0x45, 0xd429);
+                alc_write_coef_idx(codec, 0x1b, 0x0c2b);
+                alc_write_coef_idx(codec, 0x32, 0x4ea3);
+                break;
+        case 0x10ec0292:
+                alc_write_coef_idx(codec, 0x6b, 0xd429);
+                alc_write_coef_idx(codec, 0x76, 0x0008);
+                alc_write_coef_idx(codec, 0x18, 0x7388);
+                break;
+        case 0x10ec0668:
+                alc_write_coef_idx(codec, 0x15, 0x0d60);
+                alc_write_coef_idx(codec, 0xc3, 0x0000);
+                break;
+        }
+        snd_printdd("Headset jack set to iPhone-style headset mode.\n");
+}
+
+/* Nokia type */
+static void alc_headset_mode_omtp(struct hda_codec *codec)
+{
+        switch (codec->vendor_id) {
+        case 0x10ec0283:
+                alc_write_coef_idx(codec, 0x45, 0xe429);
+                alc_write_coef_idx(codec, 0x1b, 0x0c2b);
+                alc_write_coef_idx(codec, 0x32, 0x4ea3);
+                break;
+        case 0x10ec0292:
+                alc_write_coef_idx(codec, 0x6b, 0xe429);
+                alc_write_coef_idx(codec, 0x76, 0x0008);
+                alc_write_coef_idx(codec, 0x18, 0x7388);
+                break;
+        case 0x10ec0668:
+                alc_write_coef_idx(codec, 0x15, 0x0d50);
+                alc_write_coef_idx(codec, 0xc3, 0x0000);
+                break;
+        }
+        snd_printdd("Headset jack set to Nokia-style headset mode.\n");
+}
+
+static void alc_determine_headset_type(struct hda_codec *codec)
+{
+        int val;
+        bool is_ctia = false;
+        struct alc_spec *spec = codec->spec;
+
+        switch (codec->vendor_id) {
+        case 0x10ec0283:
+                alc_write_coef_idx(codec, 0x45, 0xd029);
+                msleep(300);
+                val = alc_read_coef_idx(codec, 0x46);
+                is_ctia = (val & 0x0070) == 0x0070;
+                break;
+        case 0x10ec0292:
+                alc_write_coef_idx(codec, 0x6b, 0xd429);
+                msleep(300);
+                val = alc_read_coef_idx(codec, 0x6c);
+                is_ctia = (val & 0x001c) == 0x001c;
+                break;
+        case 0x10ec0668:
+                alc_write_coef_idx(codec, 0x11, 0x0001);
+                alc_write_coef_idx(codec, 0xb7, 0x802b);
+                alc_write_coef_idx(codec, 0x15, 0x0d60);
+                alc_write_coef_idx(codec, 0xc3, 0x0c00);
+                msleep(300);
+                val = alc_read_coef_idx(codec, 0xbe);
+                is_ctia = (val & 0x1c02) == 0x1c02;
+                break;
+        }
+
+        snd_printdd("Headset jack detected iPhone-style headset: %s\n",
+                    is_ctia ? "yes" : "no");
+        spec->current_headset_type = is_ctia ? ALC_HEADSET_TYPE_CTIA : ALC_HEADSET_TYPE_OMTP;
+}
+
+static void alc_update_headset_mode(struct hda_codec *codec)
+{
+        struct alc_spec *spec = codec->spec;
+
+        hda_nid_t mux_pin = spec->gen.imux_pins[spec->gen.cur_mux[0]];
+        hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0];
+
+        int new_headset_mode;
+
+        if (!snd_hda_jack_detect(codec, hp_pin))
+                new_headset_mode = ALC_HEADSET_MODE_UNPLUGGED;
+        else if (mux_pin == spec->headset_mic_pin)
+                new_headset_mode = ALC_HEADSET_MODE_HEADSET;
+        else if (mux_pin == spec->headphone_mic_pin)
+                new_headset_mode = ALC_HEADSET_MODE_MIC;
+        else
+                new_headset_mode = ALC_HEADSET_MODE_HEADPHONE;
+
+        if (new_headset_mode == spec->current_headset_mode)
+                return;
+
+        switch (new_headset_mode) {
+        case ALC_HEADSET_MODE_UNPLUGGED:
+                alc_headset_mode_unplugged(codec);
+                spec->gen.hp_jack_present = false;
+                break;
+        case ALC_HEADSET_MODE_HEADSET:
+                if (spec->current_headset_type == ALC_HEADSET_TYPE_UNKNOWN)
+                        alc_determine_headset_type(codec);
+                if (spec->current_headset_type == ALC_HEADSET_TYPE_CTIA)
+                        alc_headset_mode_ctia(codec);
+                else if (spec->current_headset_type == ALC_HEADSET_TYPE_OMTP)
+                        alc_headset_mode_omtp(codec);
+                spec->gen.hp_jack_present = true;
+                break;
+        case ALC_HEADSET_MODE_MIC:
+                alc_headset_mode_mic_in(codec, hp_pin, spec->headphone_mic_pin);
+                spec->gen.hp_jack_present = false;
+                break;
+        case ALC_HEADSET_MODE_HEADPHONE:
+                alc_headset_mode_default(codec);
+                spec->gen.hp_jack_present = true;
+                break;
+        }
+        if (new_headset_mode != ALC_HEADSET_MODE_MIC) {
+                snd_hda_set_pin_ctl_cache(codec, hp_pin,
+                                          AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN);
+                if (spec->headphone_mic_pin)
+                        snd_hda_set_pin_ctl_cache(codec, spec->headphone_mic_pin,
+                                                  PIN_VREFHIZ);
+        }
+        spec->current_headset_mode = new_headset_mode;
+
+        snd_hda_gen_update_outputs(codec);
+}
+
+static void alc_update_headset_mode_hook(struct hda_codec *codec,
+                             struct snd_ctl_elem_value *ucontrol)
+{
+        alc_update_headset_mode(codec);
+}
+
+static void alc_update_headset_jack_cb(struct hda_codec *codec, struct hda_jack_tbl *jack)
+{
+        struct alc_spec *spec = codec->spec;
+        spec->current_headset_type = ALC_HEADSET_MODE_UNKNOWN;
+        snd_hda_gen_hp_automute(codec, jack);
+}
+
+static void alc_probe_headset_mode(struct hda_codec *codec)
+{
+        int i;
+        struct alc_spec *spec = codec->spec;
+        struct auto_pin_cfg *cfg = &spec->gen.autocfg;
+
+        /* Find mic pins */
+        for (i = 0; i < cfg->num_inputs; i++) {
+                if (cfg->inputs[i].is_headset_mic && !spec->headset_mic_pin)
+                        spec->headset_mic_pin = cfg->inputs[i].pin;
+                if (cfg->inputs[i].is_headphone_mic && !spec->headphone_mic_pin)
+                        spec->headphone_mic_pin = cfg->inputs[i].pin;
+        }
+
+        spec->gen.cap_sync_hook = alc_update_headset_mode_hook;
+        spec->gen.automute_hook = alc_update_headset_mode;
+        spec->gen.hp_automute_hook = alc_update_headset_jack_cb;
+}
+
+static void alc_fixup_headset_mode(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+
+        switch (action) {
+        case HDA_FIXUP_ACT_PRE_PROBE:
+                spec->parse_flags |= HDA_PINCFG_HEADSET_MIC | HDA_PINCFG_HEADPHONE_MIC;
+                break;
+        case HDA_FIXUP_ACT_PROBE:
+                alc_probe_headset_mode(codec);
+                break;
+        case HDA_FIXUP_ACT_INIT:
+                spec->current_headset_mode = 0;
+                alc_update_headset_mode(codec);
+                break;
+        }
+}
+
+static void alc_fixup_headset_mode_no_hp_mic(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                struct alc_spec *spec = codec->spec;
+                spec->parse_flags |= HDA_PINCFG_HEADSET_MIC;
+        }
+        else
+                alc_fixup_headset_mode(codec, fix, action);
+}
+
+static void alc_fixup_headset_mode_alc668(struct hda_codec *codec,
+                                const struct hda_fixup *fix, int action)
+{
+        if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+                int val;
+                alc_write_coef_idx(codec, 0xc4, 0x8000);
+                val = alc_read_coef_idx(codec, 0xc2);
+                alc_write_coef_idx(codec, 0xc2, val & 0xfe);
+                snd_hda_set_pin_ctl_cache(codec, 0x18, 0);
+        }
+        alc_fixup_headset_mode(codec, fix, action);
+}
+
 static void alc271_hp_gate_mic_jack(struct hda_codec *codec,
                                     const struct hda_fixup *fix,
                                     int action)
@@ -2792,11 +3176,20 @@ enum {
         ALC269_FIXUP_HP_MUTE_LED,
         ALC269_FIXUP_HP_MUTE_LED_MIC1,
         ALC269_FIXUP_HP_MUTE_LED_MIC2,
+        ALC269_FIXUP_HP_GPIO_LED,
         ALC269_FIXUP_INV_DMIC,
         ALC269_FIXUP_LENOVO_DOCK,
         ALC269_FIXUP_PINCFG_NO_HP_TO_LINEOUT,
+        ALC269_FIXUP_DELL1_MIC_NO_PRESENCE,
+        ALC269_FIXUP_DELL2_MIC_NO_PRESENCE,
+        ALC269_FIXUP_HEADSET_MODE,
+        ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC,
+        ALC269_FIXUP_ASUS_X101_FUNC,
+        ALC269_FIXUP_ASUS_X101_VERB,
+        ALC269_FIXUP_ASUS_X101,
         ALC271_FIXUP_AMIC_MIC2,
         ALC271_FIXUP_HP_GATE_MIC_JACK,
+        ALC269_FIXUP_ACER_AC700,
 };
 
 static const struct hda_fixup alc269_fixups[] = {
@@ -2931,6 +3324,10 @@ static const struct hda_fixup alc269_fixups[] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc269_fixup_hp_mute_led_mic2,
         },
+        [ALC269_FIXUP_HP_GPIO_LED] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc269_fixup_hp_gpio_led,
+        },
         [ALC269_FIXUP_INV_DMIC] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc_fixup_inv_dmic_0x12,
@@ -2949,6 +3346,59 @@ static const struct hda_fixup alc269_fixups[] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc269_fixup_pincfg_no_hp_to_lineout,
         },
+        [ALC269_FIXUP_DELL1_MIC_NO_PRESENCE] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */
+                        { 0x1a, 0x01a1913d }, /* use as headphone mic, without its own jack detect */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_HEADSET_MODE
+        },
+        [ALC269_FIXUP_DELL2_MIC_NO_PRESENCE] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x16, 0x21014020 }, /* dock line out */
+                        { 0x19, 0x21a19030 }, /* dock mic */
+                        { 0x1a, 0x01a1913c }, /* use as headset mic, without its own jack detect */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
+        },
+        [ALC269_FIXUP_HEADSET_MODE] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc_fixup_headset_mode,
+        },
+        [ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc_fixup_headset_mode_no_hp_mic,
+        },
+        [ALC269_FIXUP_ASUS_X101_FUNC] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc269_fixup_x101_headset_mic,
+        },
+        [ALC269_FIXUP_ASUS_X101_VERB] = {
+                .type = HDA_FIXUP_VERBS,
+                .v.verbs = (const struct hda_verb[]) {
+                        {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+                        {0x20, AC_VERB_SET_COEF_INDEX, 0x08},
+                        {0x20, AC_VERB_SET_PROC_COEF,  0x0310},
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_ASUS_X101_FUNC
+        },
+        [ALC269_FIXUP_ASUS_X101] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x18, 0x04a1182c }, /* Headset mic */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC269_FIXUP_ASUS_X101_VERB
+        },
         [ALC271_FIXUP_AMIC_MIC2] = {
                 .type = HDA_FIXUP_PINS,
                 .v.pins = (const struct hda_pintbl[]) {
@@ -2965,12 +3415,46 @@ static const struct hda_fixup alc269_fixups[] = {
                 .chained = true,
                 .chain_id = ALC271_FIXUP_AMIC_MIC2,
         },
+        [ALC269_FIXUP_ACER_AC700] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x12, 0x99a3092f }, /* int-mic */
+                        { 0x14, 0x99130110 }, /* speaker */
+                        { 0x18, 0x03a11c20 }, /* mic */
+                        { 0x1e, 0x0346101e }, /* SPDIF1 */
+                        { 0x21, 0x0321101f }, /* HP out */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC271_FIXUP_DMIC,
+        },
 };
 
 static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x029b, "Acer 1810TZ", ALC269_FIXUP_INV_DMIC),
         SND_PCI_QUIRK(0x1025, 0x0349, "Acer AOD260", ALC269_FIXUP_INV_DMIC),
+        SND_PCI_QUIRK(0x1028, 0x05bd, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05be, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05c4, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05c5, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05c6, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05c7, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05c8, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05c9, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05ca, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05cb, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05e9, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05ea, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05eb, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05ec, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05ed, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05ee, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05f3, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05f4, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05f5, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05f6, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
+        SND_PCI_QUIRK(0x103c, 0x18e6, "HP", ALC269_FIXUP_HP_GPIO_LED),
         SND_PCI_QUIRK(0x103c, 0x1973, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),
         SND_PCI_QUIRK(0x103c, 0x1983, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1),
         SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED),
@@ -2983,11 +3467,13 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC),
         SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC),
+        SND_PCI_QUIRK(0x1043, 0x8516, "ASUS X101CH", ALC269_FIXUP_ASUS_X101),
         SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2),
         SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
         SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
         SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
         SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
+        SND_PCI_QUIRK(0x1025, 0x047c, "Acer AC700", ALC269_FIXUP_ACER_AC700),
         SND_PCI_QUIRK(0x1025, 0x0740, "Acer AO725", ALC271_FIXUP_HP_GATE_MIC_JACK),
         SND_PCI_QUIRK(0x1025, 0x0742, "Acer AO756", ALC271_FIXUP_HP_GATE_MIC_JACK),
         SND_PCI_QUIRK_VENDOR(0x1025, "Acer Aspire", ALC271_FIXUP_DMIC),
@@ -3063,6 +3549,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
         {.id = ALC271_FIXUP_DMIC, .name = "alc271-dmic"},
         {.id = ALC269_FIXUP_INV_DMIC, .name = "inv-dmic"},
         {.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"},
+        {.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"},
         {}
 };
 
@@ -3131,6 +3618,9 @@ static int patch_alc269(struct hda_codec *codec)
 
         alc_auto_parse_customize_define(codec);
 
+        if (has_cdefine_beep(codec))
+                spec->gen.beep_nid = 0x01;
+
         switch (codec->vendor_id) {
         case 0x10ec0269:
                 spec->codec_variant = ALC269_TYPE_ALC269VA;
@@ -3179,12 +3669,8 @@ static int patch_alc269(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog && spec->gen.beep_nid)
                 set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
 #ifdef CONFIG_PM
@@ -3292,6 +3778,7 @@ static int patch_alc861(struct hda_codec *codec)
                 return err;
 
         spec = codec->spec;
+        spec->gen.beep_nid = 0x23;
 
         snd_hda_pick_fixup(codec, NULL, alc861_fixup_tbl, alc861_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -3301,12 +3788,8 @@ static int patch_alc861(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog) {
-                err = snd_hda_attach_beep_device(codec, 0x23);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog)
                 set_beep_amp(spec, 0x23, 0, HDA_OUTPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
 #ifdef CONFIG_PM
@@ -3387,6 +3870,7 @@ static int patch_alc861vd(struct hda_codec *codec)
                 return err;
 
         spec = codec->spec;
+        spec->gen.beep_nid = 0x23;
 
         snd_hda_pick_fixup(codec, NULL, alc861vd_fixup_tbl, alc861vd_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -3396,12 +3880,8 @@ static int patch_alc861vd(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog) {
-                err = snd_hda_attach_beep_device(codec, 0x23);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog)
                 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
-        }
 
         codec->patch_ops = alc_patch_ops;
 
@@ -3480,6 +3960,8 @@ enum {
         ALC662_FIXUP_NO_JACK_DETECT,
         ALC662_FIXUP_ZOTAC_Z68,
         ALC662_FIXUP_INV_DMIC,
+        ALC668_FIXUP_DELL_MIC_NO_PRESENCE,
+        ALC668_FIXUP_HEADSET_MODE,
 };
 
 static const struct hda_fixup alc662_fixups[] = {
@@ -3640,6 +4122,20 @@ static const struct hda_fixup alc662_fixups[] = {
                 .type = HDA_FIXUP_FUNC,
                 .v.func = alc_fixup_inv_dmic_0x12,
         },
+        [ALC668_FIXUP_DELL_MIC_NO_PRESENCE] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, 0x03a1913d }, /* use as headphone mic, without its own jack detect */
+                        { 0x1b, 0x03a1113c }, /* use as headset mic, without its own jack detect */
+                        { }
+                },
+                .chained = true,
+                .chain_id = ALC668_FIXUP_HEADSET_MODE
+        },
+        [ALC668_FIXUP_HEADSET_MODE] = {
+                .type = HDA_FIXUP_FUNC,
+                .v.func = alc_fixup_headset_mode_alc668,
+        },
 };
 
 static const struct snd_pci_quirk alc662_fixup_tbl[] = {
@@ -3648,6 +4144,8 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x031c, "Gateway NV79", ALC662_FIXUP_SKU_IGNORE),
         SND_PCI_QUIRK(0x1025, 0x0349, "eMachines eM250", ALC662_FIXUP_INV_DMIC),
         SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE),
+        SND_PCI_QUIRK(0x1028, 0x05d8, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
         SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
         SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_FIXUP_ASUS_MODE2),
@@ -3784,6 +4282,9 @@ static int patch_alc662(struct hda_codec *codec)
 
         alc_auto_parse_customize_define(codec);
 
+        if (has_cdefine_beep(codec))
+                spec->gen.beep_nid = 0x01;
+
         if ((alc_get_coef0(codec) & (1 << 14)) &&
             codec->bus->pci->subsystem_vendor == 0x1025 &&
             spec->cdefine.platform_type == 1) {
@@ -3796,10 +4297,7 @@ static int patch_alc662(struct hda_codec *codec)
         if (err < 0)
                 goto error;
 
-        if (!spec->gen.no_analog && has_cdefine_beep(codec)) {
-                err = snd_hda_attach_beep_device(codec, 0x1);
-                if (err < 0)
-                        goto error;
+        if (!spec->gen.no_analog && spec->gen.beep_nid) {
                 switch (codec->vendor_id) {
                 case 0x10ec0662:
                         set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index dafe04ae8c72..1d9d6427e0bf 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -211,7 +211,6 @@ struct sigmatel_spec {
 
         /* beep widgets */
         hda_nid_t anabeep_nid;
-        hda_nid_t digbeep_nid;
 
         /* SPDIF-out mux */
         const char * const *spdif_labels;
@@ -3529,8 +3528,12 @@ static int stac_parse_auto_config(struct hda_codec *codec)
 {
         struct sigmatel_spec *spec = codec->spec;
         int err;
+        int flags = 0;
 
-        err = snd_hda_parse_pin_defcfg(codec, &spec->gen.autocfg, NULL, 0);
+        if (spec->headset_jack)
+                flags |= HDA_PINCFG_HEADSET_MIC;
+
+        err = snd_hda_parse_pin_defcfg(codec, &spec->gen.autocfg, NULL, flags);
         if (err < 0)
                 return err;
 
@@ -3560,16 +3563,13 @@ static int stac_parse_auto_config(struct hda_codec *codec)
 
         /* setup digital beep controls and input device */
 #ifdef CONFIG_SND_HDA_INPUT_BEEP
-        if (spec->digbeep_nid > 0) {
-                hda_nid_t nid = spec->digbeep_nid;
+        if (spec->gen.beep_nid) {
+                hda_nid_t nid = spec->gen.beep_nid;
                 unsigned int caps;
 
                 err = stac_auto_create_beep_ctls(codec, nid);
                 if (err < 0)
                         return err;
-                err = snd_hda_attach_beep_device(codec, nid);
-                if (err < 0)
-                        return err;
                 if (codec->beep) {
                         /* IDT/STAC codecs have linear beep tone parameter */
                         codec->beep->linear_tone = spec->linear_tone_beep;
@@ -3657,17 +3657,7 @@ static void stac_shutup(struct hda_codec *codec)
                                 ~spec->eapd_mask);
 }
 
-static void stac_free(struct hda_codec *codec)
-{
-        struct sigmatel_spec *spec = codec->spec;
-
-        if (!spec)
-                return;
-
-        snd_hda_gen_spec_free(&spec->gen);
-        kfree(spec);
-        snd_hda_detach_beep_device(codec);
-}
+#define stac_free       snd_hda_gen_free
 
 #ifdef CONFIG_PROC_FS
 static void stac92hd_proc_hook(struct snd_info_buffer *buffer,
@@ -3797,6 +3787,7 @@ static int patch_stac9200(struct hda_codec *codec)
         spec->gen.own_eapd_ctl = 1;
 
         codec->patch_ops = stac_patch_ops;
+        codec->power_filter = snd_hda_codec_eapd_power_filter;
 
         snd_hda_add_verbs(codec, stac9200_eapd_init);
 
@@ -3884,7 +3875,7 @@ static int patch_stac92hd73xx(struct hda_codec *codec)
         spec->aloopback_mask = 0x01;
         spec->aloopback_shift = 8;
 
-        spec->digbeep_nid = 0x1c;
+        spec->gen.beep_nid = 0x1c; /* digital beep */
 
         /* GPIO0 High = Enable EAPD */
         spec->eapd_mask = spec->gpio_mask = spec->gpio_dir = 0x1;
@@ -3968,7 +3959,7 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
         spec->gen.power_down_unused = 1;
         spec->gen.mixer_nid = 0x1b;
 
-        spec->digbeep_nid = 0x21;
+        spec->gen.beep_nid = 0x21; /* digital beep */
         spec->pwr_nids = stac92hd83xxx_pwr_nids;
         spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids);
         spec->default_polarity = -1; /* no default cfg */
@@ -4016,7 +4007,7 @@ static int patch_stac92hd95(struct hda_codec *codec)
         spec->gen.own_eapd_ctl = 1;
         spec->gen.power_down_unused = 1;
 
-        spec->digbeep_nid = 0x19;
+        spec->gen.beep_nid = 0x19; /* digital beep */
         spec->pwr_nids = stac92hd95_pwr_nids;
         spec->num_pwrs = ARRAY_SIZE(stac92hd95_pwr_nids);
         spec->default_polarity = -1; /* no default cfg */
@@ -4091,7 +4082,7 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
         spec->aloopback_shift = 0;
 
         spec->powerdown_adcs = 1;
-        spec->digbeep_nid = 0x26;
+        spec->gen.beep_nid = 0x26; /* digital beep */
         spec->num_pwrs = ARRAY_SIZE(stac92hd71bxx_pwr_nids);
         spec->pwr_nids = stac92hd71bxx_pwr_nids;
 
@@ -4173,7 +4164,7 @@ static int patch_stac927x(struct hda_codec *codec)
         spec->have_spdif_mux = 1;
         spec->spdif_labels = stac927x_spdif_labels;
 
-        spec->digbeep_nid = 0x23;
+        spec->gen.beep_nid = 0x23; /* digital beep */
 
         /* GPIO0 High = Enable EAPD */
         spec->eapd_mask = spec->gpio_mask = 0x01;
@@ -4232,7 +4223,7 @@ static int patch_stac9205(struct hda_codec *codec)
         spec->gen.own_eapd_ctl = 1;
         spec->have_spdif_mux = 1;
 
-        spec->digbeep_nid = 0x23;
+        spec->gen.beep_nid = 0x23; /* digital beep */
 
         snd_hda_add_verbs(codec, stac9205_core_init);
         spec->aloopback_ctl = &stac9205_loopback;
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index c35338a8771d..e0dadcf2030d 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -626,11 +626,31 @@ static void via_set_jack_unsol_events(struct hda_codec *codec)
         }
 }
 
+static const struct badness_table via_main_out_badness = {
+        .no_primary_dac = 0x10000,
+        .no_dac = 0x4000,
+        .shared_primary = 0x10000,
+        .shared_surr = 0x20,
+        .shared_clfe = 0x20,
+        .shared_surr_main = 0x20,
+};
+static const struct badness_table via_extra_out_badness = {
+        .no_primary_dac = 0x4000,
+        .no_dac = 0x4000,
+        .shared_primary = 0x12,
+        .shared_surr = 0x20,
+        .shared_clfe = 0x20,
+        .shared_surr_main = 0x10,
+};
+
 static int via_parse_auto_config(struct hda_codec *codec)
 {
         struct via_spec *spec = codec->spec;
         int err;
 
+        spec->gen.main_out_badness = &via_main_out_badness;
+        spec->gen.extra_out_badness = &via_extra_out_badness;
+
         err = snd_hda_parse_pin_defcfg(codec, &spec->gen.autocfg, NULL, 0);
         if (err < 0)
                 return err;
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 223c3d9cc69e..9ea05e956474 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -969,6 +969,7 @@ static int snd_hdspm_create_pcm(struct snd_card *card,
                                 struct hdspm *hdspm);
 
 static inline void snd_hdspm_initialize_midi_flush(struct hdspm *hdspm);
+static inline int hdspm_get_pll_freq(struct hdspm *hdspm);
 static int hdspm_update_simple_mixer_controls(struct hdspm *hdspm);
 static int hdspm_autosync_ref(struct hdspm *hdspm);
 static int snd_hdspm_set_defaults(struct hdspm *hdspm);
@@ -1075,6 +1076,20 @@ static int snd_hdspm_use_is_exclusive(struct hdspm *hdspm)
         return ret;
 }
 
+/* round arbitary sample rates to commonly known rates */
+static int hdspm_round_frequency(int rate)
+{
+        if (rate < 38050)
+                return 32000;
+        if (rate < 46008)
+                return 44100;
+        else
+                return 48000;
+}
+
+static int hdspm_tco_sync_check(struct hdspm *hdspm);
+static int hdspm_sync_in_sync_check(struct hdspm *hdspm);
+
 /* check for external sample rate */
 static int hdspm_external_sample_rate(struct hdspm *hdspm)
 {
@@ -1216,22 +1231,45 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
                                 break;
                         }
 
-                        /* QS and DS rates normally can not be detected
-                         * automatically by the card. Only exception is MADI
-                         * in 96k frame mode.
-                         *
-                         * So if we read SS values (32 .. 48k), check for
-                         * user-provided DS/QS bits in the control register
-                         * and multiply the base frequency accordingly.
-                         */
-                        if (rate <= 48000) {
-                                if (hdspm->control_register & HDSPM_QuadSpeed)
-                                        rate *= 4;
-                                else if (hdspm->control_register &
-                                                HDSPM_DoubleSpeed)
-                                        rate *= 2;
+                } /* endif HDSPM_madiLock */
+
+                /* check sample rate from TCO or SYNC_IN */
+                {
+                        bool is_valid_input = 0;
+                        bool has_sync = 0;
+
+                        syncref = hdspm_autosync_ref(hdspm);
+                        if (HDSPM_AUTOSYNC_FROM_TCO == syncref) {
+                                is_valid_input = 1;
+                                has_sync = (HDSPM_SYNC_CHECK_SYNC ==
+                                        hdspm_tco_sync_check(hdspm));
+                        } else if (HDSPM_AUTOSYNC_FROM_SYNC_IN == syncref) {
+                                is_valid_input = 1;
+                                has_sync = (HDSPM_SYNC_CHECK_SYNC ==
+                                        hdspm_sync_in_sync_check(hdspm));
+                        }
+
+                        if (is_valid_input && has_sync) {
+                                rate = hdspm_round_frequency(
+                                        hdspm_get_pll_freq(hdspm));
                         }
                 }
+
+                /* QS and DS rates normally can not be detected
+                 * automatically by the card. Only exception is MADI
+                 * in 96k frame mode.
+                 *
+                 * So if we read SS values (32 .. 48k), check for
+                 * user-provided DS/QS bits in the control register
+                 * and multiply the base frequency accordingly.
+                 */
+                if (rate <= 48000) {
+                        if (hdspm->control_register & HDSPM_QuadSpeed)
+                                rate *= 4;
+                        else if (hdspm->control_register &
+                                        HDSPM_DoubleSpeed)
+                                rate *= 2;
+                }
                 break;
         }
 
@@ -1979,16 +2017,25 @@ static void hdspm_midi_tasklet(unsigned long arg)
 /* get the system sample rate which is set */
 
 
+static inline int hdspm_get_pll_freq(struct hdspm *hdspm)
+{
+        unsigned int period, rate;
+
+        period = hdspm_read(hdspm, HDSPM_RD_PLL_FREQ);
+        rate = hdspm_calc_dds_value(hdspm, period);
+
+        return rate;
+}
+
 /**
  * Calculate the real sample rate from the
  * current DDS value.
  **/
 static int hdspm_get_system_sample_rate(struct hdspm *hdspm)
 {
-        unsigned int period, rate;
+        unsigned int rate;
 
-        period = hdspm_read(hdspm, HDSPM_RD_PLL_FREQ);
-        rate = hdspm_calc_dds_value(hdspm, period);
+        rate = hdspm_get_pll_freq(hdspm);
 
         if (rate > 207000) {
                 /* Unreasonable high sample rate as seen on PCI MADI cards. */
@@ -2128,6 +2175,16 @@ static int hdspm_get_s1_sample_rate(struct hdspm *hdspm, unsigned int idx)
         return (status >> (idx*4)) & 0xF;
 }
 
+#define ENUMERATED_CTL_INFO(info, texts) \
+{ \
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; \
+        uinfo->count = 1; \
+        uinfo->value.enumerated.items = ARRAY_SIZE(texts); \
+        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) \
+                uinfo->value.enumerated.item =  uinfo->value.enumerated.items - 1; \
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); \
+}
+
 
 
 #define HDSPM_AUTOSYNC_SAMPLE_RATE(xname, xindex) \
@@ -2143,14 +2200,7 @@ static int hdspm_get_s1_sample_rate(struct hdspm *hdspm, unsigned int idx)
 static int snd_hdspm_info_autosync_sample_rate(struct snd_kcontrol *kcontrol,
                                                struct snd_ctl_elem_info *uinfo)
 {
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 10;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
-        strcpy(uinfo->value.enumerated.name,
-                        texts_freq[uinfo->value.enumerated.item]);
+        ENUMERATED_CTL_INFO(uinfo, texts_freq);
         return 0;
 }
 
@@ -2316,15 +2366,7 @@ static int snd_hdspm_info_system_clock_mode(struct snd_kcontrol *kcontrol,
                                             struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = { "Master", "AutoSync" };
-
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 2;
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                    uinfo->value.enumerated.items - 1;
-        strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
+        ENUMERATED_CTL_INFO(uinfo, texts);
         return 0;
 }
 
@@ -2888,6 +2930,112 @@ static int snd_hdspm_get_autosync_ref(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
+
+
+#define HDSPM_TCO_VIDEO_INPUT_FORMAT(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READ |\
+                SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_video_input_format, \
+        .get = snd_hdspm_get_tco_video_input_format, \
+}
+
+static int snd_hdspm_info_tco_video_input_format(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = {"No video", "NTSC", "PAL"};
+        ENUMERATED_CTL_INFO(uinfo, texts);
+        return 0;
+}
+
+static int snd_hdspm_get_tco_video_input_format(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol)
+{
+        u32 status;
+        int ret = 0;
+
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+        status = hdspm_read(hdspm, HDSPM_RD_TCO + 4);
+        switch (status & (HDSPM_TCO1_Video_Input_Format_NTSC |
+                        HDSPM_TCO1_Video_Input_Format_PAL)) {
+        case HDSPM_TCO1_Video_Input_Format_NTSC:
+                /* ntsc */
+                ret = 1;
+                break;
+        case HDSPM_TCO1_Video_Input_Format_PAL:
+                /* pal */
+                ret = 2;
+                break;
+        default:
+                /* no video */
+                ret = 0;
+                break;
+        }
+        ucontrol->value.enumerated.item[0] = ret;
+        return 0;
+}
+
+
+
+#define HDSPM_TCO_LTC_FRAMES(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READ |\
+                SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_info_tco_ltc_frames, \
+        .get = snd_hdspm_get_tco_ltc_frames, \
+}
+
+static int snd_hdspm_info_tco_ltc_frames(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = {"No lock", "24 fps", "25 fps", "29.97 fps",
+                                "30 fps"};
+        ENUMERATED_CTL_INFO(uinfo, texts);
+        return 0;
+}
+
+static int hdspm_tco_ltc_frames(struct hdspm *hdspm)
+{
+        u32 status;
+        int ret = 0;
+
+        status = hdspm_read(hdspm, HDSPM_RD_TCO + 4);
+        if (status & HDSPM_TCO1_LTC_Input_valid) {
+                switch (status & (HDSPM_TCO1_LTC_Format_LSB |
+                                        HDSPM_TCO1_LTC_Format_MSB)) {
+                case 0:
+                        /* 24 fps */
+                        ret = 1;
+                        break;
+                case HDSPM_TCO1_LTC_Format_LSB:
+                        /* 25 fps */
+                        ret = 2;
+                        break;
+                case HDSPM_TCO1_LTC_Format_MSB:
+                        /* 25 fps */
+                        ret = 3;
+                        break;
+                default:
+                        /* 30 fps */
+                        ret = 4;
+                        break;
+                }
+        }
+
+        return ret;
+}
+
+static int snd_hdspm_get_tco_ltc_frames(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol)
+{
+        struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = hdspm_tco_ltc_frames(hdspm);
+        return 0;
+}
+
 #define HDSPM_TOGGLE_SETTING(xname, xindex) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
         .name = xname, \
@@ -2974,17 +3122,7 @@ static int snd_hdspm_info_input_select(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = { "optical", "coaxial" };
-
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 2;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                    uinfo->value.enumerated.items - 1;
-        strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
-
+        ENUMERATED_CTL_INFO(uinfo, texts);
         return 0;
 }
 
@@ -3046,17 +3184,7 @@ static int snd_hdspm_info_ds_wire(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = { "Single", "Double" };
-
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 2;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                    uinfo->value.enumerated.items - 1;
-        strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
-
+        ENUMERATED_CTL_INFO(uinfo, texts);
         return 0;
 }
 
@@ -3129,17 +3257,7 @@ static int snd_hdspm_info_qs_wire(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = { "Single", "Double", "Quad" };
-
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 3;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                    uinfo->value.enumerated.items - 1;
-        strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
-
+        ENUMERATED_CTL_INFO(uinfo, texts);
         return 0;
 }
 
@@ -3215,17 +3333,7 @@ static int snd_hdspm_info_madi_speedmode(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = { "Single", "Double", "Quad" };
-
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 3;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                    uinfo->value.enumerated.items - 1;
-        strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
-
+        ENUMERATED_CTL_INFO(uinfo, texts);
         return 0;
 }
 
@@ -3445,19 +3553,30 @@ static int snd_hdspm_put_playback_mixer(struct snd_kcontrol *kcontrol,
         .get = snd_hdspm_get_sync_check \
 }
 
+#define HDSPM_TCO_LOCK_CHECK(xname, xindex) \
+{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+        .name = xname, \
+        .private_value = xindex, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
+        .info = snd_hdspm_tco_info_lock_check, \
+        .get = snd_hdspm_get_sync_check \
+}
+
+
 
 static int snd_hdspm_info_sync_check(struct snd_kcontrol *kcontrol,
                                      struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = { "No Lock", "Lock", "Sync", "N/A" };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 4;
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                        uinfo->value.enumerated.items - 1;
-        strcpy(uinfo->value.enumerated.name,
-                        texts[uinfo->value.enumerated.item]);
+        ENUMERATED_CTL_INFO(uinfo, texts);
+        return 0;
+}
+
+static int snd_hdspm_tco_info_lock_check(struct snd_kcontrol *kcontrol,
+                                     struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[] = { "No Lock", "Lock" };
+        ENUMERATED_CTL_INFO(uinfo, texts);
         return 0;
 }
 
@@ -3590,6 +3709,14 @@ static int hdspm_aes_sync_check(struct hdspm *hdspm, int idx)
         return 0;
 }
 
+static int hdspm_tco_input_check(struct hdspm *hdspm, u32 mask)
+{
+        u32 status;
+        status = hdspm_read(hdspm, HDSPM_RD_TCO + 4);
+
+        return (status & mask) ? 1 : 0;
+}
+
 
 static int hdspm_tco_sync_check(struct hdspm *hdspm)
 {
@@ -3697,6 +3824,22 @@ static int snd_hdspm_get_sync_check(struct snd_kcontrol *kcontrol,
 
         }
 
+        if (hdspm->tco) {
+                switch (kcontrol->private_value) {
+                case 11:
+                        /* Check TCO for lock state of its current input */
+                        val = hdspm_tco_input_check(hdspm, HDSPM_TCO1_TCO_lock);
+                        break;
+                case 12:
+                        /* Check TCO for valid time code on LTC input. */
+                        val = hdspm_tco_input_check(hdspm,
+                                HDSPM_TCO1_LTC_Input_valid);
+                        break;
+                default:
+                        break;
+                }
+        }
+
         if (-1 == val)
                 val = 3;
 
@@ -3813,17 +3956,7 @@ static int snd_hdspm_info_tco_sample_rate(struct snd_kcontrol *kcontrol,
                                           struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = { "44.1 kHz", "48 kHz" };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 2;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                        uinfo->value.enumerated.items - 1;
-
-        strcpy(uinfo->value.enumerated.name,
-                        texts[uinfo->value.enumerated.item]);
-
+        ENUMERATED_CTL_INFO(uinfo, texts);
         return 0;
 }
 
@@ -3869,17 +4002,7 @@ static int snd_hdspm_info_tco_pull(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = { "0", "+ 0.1 %", "- 0.1 %", "+ 4 %", "- 4 %" };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 5;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                        uinfo->value.enumerated.items - 1;
-
-        strcpy(uinfo->value.enumerated.name,
-                        texts[uinfo->value.enumerated.item]);
-
+        ENUMERATED_CTL_INFO(uinfo, texts);
         return 0;
 }
 
@@ -3924,17 +4047,7 @@ static int snd_hdspm_info_tco_wck_conversion(struct snd_kcontrol *kcontrol,
                                              struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = { "1:1", "44.1 -> 48", "48 -> 44.1" };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 3;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                        uinfo->value.enumerated.items - 1;
-
-        strcpy(uinfo->value.enumerated.name,
-                        texts[uinfo->value.enumerated.item]);
-
+        ENUMERATED_CTL_INFO(uinfo, texts);
         return 0;
 }
 
@@ -3981,17 +4094,7 @@ static int snd_hdspm_info_tco_frame_rate(struct snd_kcontrol *kcontrol,
 {
         static char *texts[] = { "24 fps", "25 fps", "29.97fps",
                 "29.97 dfps", "30 fps", "30 dfps" };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 6;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                        uinfo->value.enumerated.items - 1;
-
-        strcpy(uinfo->value.enumerated.name,
-                        texts[uinfo->value.enumerated.item]);
-
+        ENUMERATED_CTL_INFO(uinfo, texts);
         return 0;
 }
 
@@ -4037,17 +4140,7 @@ static int snd_hdspm_info_tco_sync_source(struct snd_kcontrol *kcontrol,
                                           struct snd_ctl_elem_info *uinfo)
 {
         static char *texts[] = { "LTC", "Video", "WCK" };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 3;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                        uinfo->value.enumerated.items - 1;
-
-        strcpy(uinfo->value.enumerated.name,
-                        texts[uinfo->value.enumerated.item]);
-
+        ENUMERATED_CTL_INFO(uinfo, texts);
         return 0;
 }
 
@@ -4145,6 +4238,7 @@ static struct snd_kcontrol_new snd_hdspm_controls_madi[] = {
         HDSPM_SYNC_CHECK("SYNC IN SyncCheck", 3),
         HDSPM_TOGGLE_SETTING("Line Out", HDSPM_LineOut),
         HDSPM_TOGGLE_SETTING("TX 64 channels mode", HDSPM_TX_64ch),
+        HDSPM_TOGGLE_SETTING("Disable 96K frames", HDSPM_SMUX),
         HDSPM_TOGGLE_SETTING("Clear Track Marker", HDSPM_clr_tms),
         HDSPM_TOGGLE_SETTING("Safe Mode", HDSPM_AutoInp),
         HDSPM_INPUT_SELECT("Input Select", 0),
@@ -4272,7 +4366,11 @@ static struct snd_kcontrol_new snd_hdspm_controls_tco[] = {
         HDSPM_TCO_WCK_CONVERSION("TCO WCK Conversion", 0),
         HDSPM_TCO_FRAME_RATE("TCO Frame Rate", 0),
         HDSPM_TCO_SYNC_SOURCE("TCO Sync Source", 0),
-        HDSPM_TCO_WORD_TERM("TCO Word Term", 0)
+        HDSPM_TCO_WORD_TERM("TCO Word Term", 0),
+        HDSPM_TCO_LOCK_CHECK("TCO Input Check", 11),
+        HDSPM_TCO_LOCK_CHECK("TCO LTC Valid", 12),
+        HDSPM_TCO_LTC_FRAMES("TCO Detected Frame Rate", 0),
+        HDSPM_TCO_VIDEO_INPUT_FORMAT("Video Input Format", 0)
 };
 
 
diff --git a/sound/sound_core.c b/sound/sound_core.c
index bb23009edc8d..359753fc24e1 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -352,7 +352,9 @@ static struct sound_unit *chains[SOUND_STEP];
  *      @dev: device pointer
  *
  *      Allocate a special sound device by minor number from the sound
- *      subsystem. The allocated number is returned on success. On failure
+ *      subsystem.
+ *
+ *      Return: The allocated number is returned on success. On failure,
  *      a negative error code is returned.
  */
  
@@ -436,8 +438,10 @@ EXPORT_SYMBOL(register_sound_special);
  *      @dev: Unit number to allocate
  *
  *      Allocate a mixer device. Unit is the number of the mixer requested.
- *      Pass -1 to request the next free mixer unit. On success the allocated
- *      number is returned, on failure a negative error code is returned.
+ *      Pass -1 to request the next free mixer unit.
+ *
+ *      Return: On success, the allocated number is returned. On failure,
+ *      a negative error code is returned.
  */
 
 int register_sound_mixer(const struct file_operations *fops, int dev)
@@ -454,8 +458,10 @@ EXPORT_SYMBOL(register_sound_mixer);
  *      @dev: Unit number to allocate
  *
  *      Allocate a midi device. Unit is the number of the midi device requested.
- *      Pass -1 to request the next free midi unit. On success the allocated
- *      number is returned, on failure a negative error code is returned.
+ *      Pass -1 to request the next free midi unit.
+ *
+ *      Return: On success, the allocated number is returned. On failure,
+ *      a negative error code is returned.
  */
 
 int register_sound_midi(const struct file_operations *fops, int dev)
@@ -477,11 +483,13 @@ EXPORT_SYMBOL(register_sound_midi);
  *      @dev: Unit number to allocate
  *
  *      Allocate a DSP device. Unit is the number of the DSP requested.
- *      Pass -1 to request the next free DSP unit. On success the allocated
- *      number is returned, on failure a negative error code is returned.
+ *      Pass -1 to request the next free DSP unit.
  *
  *      This function allocates both the audio and dsp device entries together
  *      and will always allocate them as a matching pair - eg dsp3/audio3
+ *
+ *      Return: On success, the allocated number is returned. On failure,
+ *      a negative error code is returned.
  */
 
 int register_sound_dsp(const struct file_operations *fops, int dev)
diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c
index 4dd60d8a4889..a1a24b979ed2 100644
--- a/sound/spi/at73c213.c
+++ b/sound/spi/at73c213.c
@@ -1075,10 +1075,11 @@ out:
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int snd_at73c213_suspend(struct spi_device *spi, pm_message_t msg)
+#ifdef CONFIG_PM_SLEEP
+
+static int snd_at73c213_suspend(struct device *dev)
 {
-        struct snd_card *card = dev_get_drvdata(&spi->dev);
+        struct snd_card *card = dev_get_drvdata(dev);
         struct snd_at73c213 *chip = card->private_data;
 
         ssc_writel(chip->ssc->regs, CR, SSC_BIT(CR_TXDIS));
@@ -1087,9 +1088,9 @@ static int snd_at73c213_suspend(struct spi_device *spi, pm_message_t msg)
         return 0;
 }
 
-static int snd_at73c213_resume(struct spi_device *spi)
+static int snd_at73c213_resume(struct device *dev)
 {
-        struct snd_card *card = dev_get_drvdata(&spi->dev);
+        struct snd_card *card = dev_get_drvdata(dev);
         struct snd_at73c213 *chip = card->private_data;
 
         clk_enable(chip->board->dac_clk);
@@ -1097,18 +1098,21 @@ static int snd_at73c213_resume(struct spi_device *spi)
 
         return 0;
 }
+
+static SIMPLE_DEV_PM_OPS(at73c213_pm_ops, snd_at73c213_suspend,
+                snd_at73c213_resume);
+#define AT73C213_PM_OPS (&at73c213_pm_ops)
+
 #else
-#define snd_at73c213_suspend NULL
-#define snd_at73c213_resume NULL
+#define AT73C213_PM_OPS NULL
 #endif
 
 static struct spi_driver at73c213_driver = {
         .driver         = {
                 .name   = "at73c213",
+                .pm     = AT73C213_PM_OPS,
         },
         .probe          = snd_at73c213_probe,
-        .suspend        = snd_at73c213_suspend,
-        .resume         = snd_at73c213_resume,
         .remove         = snd_at73c213_remove,
 };
 
diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c
index fde9a7a29cb6..67330af21b0e 100644
--- a/sound/usb/caiaq/audio.c
+++ b/sound/usb/caiaq/audio.c
@@ -16,6 +16,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
 
+#include <linux/device.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/init.h>
@@ -39,8 +40,8 @@
 #define ENDPOINT_CAPTURE        2
 #define ENDPOINT_PLAYBACK       6
 
-#define MAKE_CHECKBYTE(dev,stream,i) \
-        (stream << 1) | (~(i / (dev->n_streams * BYTES_PER_SAMPLE_USB)) & 1)
+#define MAKE_CHECKBYTE(cdev,stream,i) \
+        (stream << 1) | (~(i / (cdev->n_streams * BYTES_PER_SAMPLE_USB)) & 1)
 
 static struct snd_pcm_hardware snd_usb_caiaq_pcm_hardware = {
         .info           = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -60,32 +61,32 @@ static struct snd_pcm_hardware snd_usb_caiaq_pcm_hardware = {
 };
 
 static void
-activate_substream(struct snd_usb_caiaqdev *dev,
+activate_substream(struct snd_usb_caiaqdev *cdev,
                    struct snd_pcm_substream *sub)
 {
-        spin_lock(&dev->spinlock);
+        spin_lock(&cdev->spinlock);
 
         if (sub->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                dev->sub_playback[sub->number] = sub;
+                cdev->sub_playback[sub->number] = sub;
         else
-                dev->sub_capture[sub->number] = sub;
+                cdev->sub_capture[sub->number] = sub;
 
-        spin_unlock(&dev->spinlock);
+        spin_unlock(&cdev->spinlock);
 }
 
 static void
-deactivate_substream(struct snd_usb_caiaqdev *dev,
+deactivate_substream(struct snd_usb_caiaqdev *cdev,
                      struct snd_pcm_substream *sub)
 {
         unsigned long flags;
-        spin_lock_irqsave(&dev->spinlock, flags);
+        spin_lock_irqsave(&cdev->spinlock, flags);
 
         if (sub->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                dev->sub_playback[sub->number] = NULL;
+                cdev->sub_playback[sub->number] = NULL;
         else
-                dev->sub_capture[sub->number] = NULL;
+                cdev->sub_capture[sub->number] = NULL;
 
-        spin_unlock_irqrestore(&dev->spinlock, flags);
+        spin_unlock_irqrestore(&cdev->spinlock, flags);
 }
 
 static int
@@ -98,28 +99,30 @@ all_substreams_zero(struct snd_pcm_substream **subs)
         return 1;
 }
 
-static int stream_start(struct snd_usb_caiaqdev *dev)
+static int stream_start(struct snd_usb_caiaqdev *cdev)
 {
         int i, ret;
+        struct device *dev = caiaqdev_to_dev(cdev);
 
-        debug("%s(%p)\n", __func__, dev);
+        dev_dbg(dev, "%s(%p)\n", __func__, cdev);
 
-        if (dev->streaming)
+        if (cdev->streaming)
                 return -EINVAL;
 
-        memset(dev->sub_playback, 0, sizeof(dev->sub_playback));
-        memset(dev->sub_capture, 0, sizeof(dev->sub_capture));
-        dev->input_panic = 0;
-        dev->output_panic = 0;
-        dev->first_packet = 4;
-        dev->streaming = 1;
-        dev->warned = 0;
+        memset(cdev->sub_playback, 0, sizeof(cdev->sub_playback));
+        memset(cdev->sub_capture, 0, sizeof(cdev->sub_capture));
+        cdev->input_panic = 0;
+        cdev->output_panic = 0;
+        cdev->first_packet = 4;
+        cdev->streaming = 1;
+        cdev->warned = 0;
 
         for (i = 0; i < N_URBS; i++) {
-                ret = usb_submit_urb(dev->data_urbs_in[i], GFP_ATOMIC);
+                ret = usb_submit_urb(cdev->data_urbs_in[i], GFP_ATOMIC);
                 if (ret) {
-                        log("unable to trigger read #%d! (ret %d)\n", i, ret);
-                        dev->streaming = 0;
+                        dev_err(dev, "unable to trigger read #%d! (ret %d)\n",
+                                i, ret);
+                        cdev->streaming = 0;
                         return -EPIPE;
                 }
         }
@@ -127,46 +130,51 @@ static int stream_start(struct snd_usb_caiaqdev *dev)
         return 0;
 }
 
-static void stream_stop(struct snd_usb_caiaqdev *dev)
+static void stream_stop(struct snd_usb_caiaqdev *cdev)
 {
         int i;
+        struct device *dev = caiaqdev_to_dev(cdev);
 
-        debug("%s(%p)\n", __func__, dev);
-        if (!dev->streaming)
+        dev_dbg(dev, "%s(%p)\n", __func__, cdev);
+        if (!cdev->streaming)
                 return;
 
-        dev->streaming = 0;
+        cdev->streaming = 0;
 
         for (i = 0; i < N_URBS; i++) {
-                usb_kill_urb(dev->data_urbs_in[i]);
+                usb_kill_urb(cdev->data_urbs_in[i]);
 
-                if (test_bit(i, &dev->outurb_active_mask))
-                        usb_kill_urb(dev->data_urbs_out[i]);
+                if (test_bit(i, &cdev->outurb_active_mask))
+                        usb_kill_urb(cdev->data_urbs_out[i]);
         }
 
-        dev->outurb_active_mask = 0;
+        cdev->outurb_active_mask = 0;
 }
 
 static int snd_usb_caiaq_substream_open(struct snd_pcm_substream *substream)
 {
-        struct snd_usb_caiaqdev *dev = snd_pcm_substream_chip(substream);
-        debug("%s(%p)\n", __func__, substream);
-        substream->runtime->hw = dev->pcm_info;
+        struct snd_usb_caiaqdev *cdev = snd_pcm_substream_chip(substream);
+        struct device *dev = caiaqdev_to_dev(cdev);
+
+        dev_dbg(dev, "%s(%p)\n", __func__, substream);
+        substream->runtime->hw = cdev->pcm_info;
         snd_pcm_limit_hw_rates(substream->runtime);
+
         return 0;
 }
 
 static int snd_usb_caiaq_substream_close(struct snd_pcm_substream *substream)
 {
-        struct snd_usb_caiaqdev *dev = snd_pcm_substream_chip(substream);
+        struct snd_usb_caiaqdev *cdev = snd_pcm_substream_chip(substream);
+        struct device *dev = caiaqdev_to_dev(cdev);
 
-        debug("%s(%p)\n", __func__, substream);
-        if (all_substreams_zero(dev->sub_playback) &&
-            all_substreams_zero(dev->sub_capture)) {
+        dev_dbg(dev, "%s(%p)\n", __func__, substream);
+        if (all_substreams_zero(cdev->sub_playback) &&
+            all_substreams_zero(cdev->sub_capture)) {
                 /* when the last client has stopped streaming,
                  * all sample rates are allowed again */
-                stream_stop(dev);
-                dev->pcm_info.rates = dev->samplerates;
+                stream_stop(cdev);
+                cdev->pcm_info.rates = cdev->samplerates;
         }
 
         return 0;
@@ -175,15 +183,13 @@ static int snd_usb_caiaq_substream_close(struct snd_pcm_substream *substream)
 static int snd_usb_caiaq_pcm_hw_params(struct snd_pcm_substream *sub,
                                        struct snd_pcm_hw_params *hw_params)
 {
-        debug("%s(%p)\n", __func__, sub);
         return snd_pcm_lib_malloc_pages(sub, params_buffer_bytes(hw_params));
 }
 
 static int snd_usb_caiaq_pcm_hw_free(struct snd_pcm_substream *sub)
 {
-        struct snd_usb_caiaqdev *dev = snd_pcm_substream_chip(sub);
-        debug("%s(%p)\n", __func__, sub);
-        deactivate_substream(dev, sub);
+        struct snd_usb_caiaqdev *cdev = snd_pcm_substream_chip(sub);
+        deactivate_substream(cdev, sub);
         return snd_pcm_lib_free_pages(sub);
 }
 
@@ -199,15 +205,16 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
 {
         int bytes_per_sample, bpp, ret, i;
         int index = substream->number;
-        struct snd_usb_caiaqdev *dev = snd_pcm_substream_chip(substream);
+        struct snd_usb_caiaqdev *cdev = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
+        struct device *dev = caiaqdev_to_dev(cdev);
 
-        debug("%s(%p)\n", __func__, substream);
+        dev_dbg(dev, "%s(%p)\n", __func__, substream);
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 int out_pos;
 
-                switch (dev->spec.data_alignment) {
+                switch (cdev->spec.data_alignment) {
                 case 0:
                 case 2:
                         out_pos = BYTES_PER_SAMPLE + 1;
@@ -218,12 +225,12 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
                         break;
                 }
 
-                dev->period_out_count[index] = out_pos;
-                dev->audio_out_buf_pos[index] = out_pos;
+                cdev->period_out_count[index] = out_pos;
+                cdev->audio_out_buf_pos[index] = out_pos;
         } else {
                 int in_pos;
 
-                switch (dev->spec.data_alignment) {
+                switch (cdev->spec.data_alignment) {
                 case 0:
                         in_pos = BYTES_PER_SAMPLE + 2;
                         break;
@@ -236,44 +243,44 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
                         break;
                 }
 
-                dev->period_in_count[index] = in_pos;
-                dev->audio_in_buf_pos[index] = in_pos;
+                cdev->period_in_count[index] = in_pos;
+                cdev->audio_in_buf_pos[index] = in_pos;
         }
 
-        if (dev->streaming)
+        if (cdev->streaming)
                 return 0;
 
         /* the first client that opens a stream defines the sample rate
          * setting for all subsequent calls, until the last client closed. */
         for (i=0; i < ARRAY_SIZE(rates); i++)
                 if (runtime->rate == rates[i])
-                        dev->pcm_info.rates = 1 << i;
+                        cdev->pcm_info.rates = 1 << i;
 
         snd_pcm_limit_hw_rates(runtime);
 
         bytes_per_sample = BYTES_PER_SAMPLE;
-        if (dev->spec.data_alignment >= 2)
+        if (cdev->spec.data_alignment >= 2)
                 bytes_per_sample++;
 
         bpp = ((runtime->rate / 8000) + CLOCK_DRIFT_TOLERANCE)
-                * bytes_per_sample * CHANNELS_PER_STREAM * dev->n_streams;
+                * bytes_per_sample * CHANNELS_PER_STREAM * cdev->n_streams;
 
         if (bpp > MAX_ENDPOINT_SIZE)
                 bpp = MAX_ENDPOINT_SIZE;
 
-        ret = snd_usb_caiaq_set_audio_params(dev, runtime->rate,
+        ret = snd_usb_caiaq_set_audio_params(cdev, runtime->rate,
                                              runtime->sample_bits, bpp);
         if (ret)
                 return ret;
 
-        ret = stream_start(dev);
+        ret = stream_start(cdev);
         if (ret)
                 return ret;
 
-        dev->output_running = 0;
-        wait_event_timeout(dev->prepare_wait_queue, dev->output_running, HZ);
-        if (!dev->output_running) {
-                stream_stop(dev);
+        cdev->output_running = 0;
+        wait_event_timeout(cdev->prepare_wait_queue, cdev->output_running, HZ);
+        if (!cdev->output_running) {
+                stream_stop(cdev);
                 return -EPIPE;
         }
 
@@ -282,18 +289,19 @@ static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)
 
 static int snd_usb_caiaq_pcm_trigger(struct snd_pcm_substream *sub, int cmd)
 {
-        struct snd_usb_caiaqdev *dev = snd_pcm_substream_chip(sub);
+        struct snd_usb_caiaqdev *cdev = snd_pcm_substream_chip(sub);
+        struct device *dev = caiaqdev_to_dev(cdev);
 
-        debug("%s(%p) cmd %d\n", __func__, sub, cmd);
+        dev_dbg(dev, "%s(%p) cmd %d\n", __func__, sub, cmd);
 
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                activate_substream(dev, sub);
+                activate_substream(cdev, sub);
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                deactivate_substream(dev, sub);
+                deactivate_substream(cdev, sub);
                 break;
         default:
                 return -EINVAL;
@@ -306,25 +314,25 @@ static snd_pcm_uframes_t
 snd_usb_caiaq_pcm_pointer(struct snd_pcm_substream *sub)
 {
         int index = sub->number;
-        struct snd_usb_caiaqdev *dev = snd_pcm_substream_chip(sub);
+        struct snd_usb_caiaqdev *cdev = snd_pcm_substream_chip(sub);
         snd_pcm_uframes_t ptr;
 
-        spin_lock(&dev->spinlock);
+        spin_lock(&cdev->spinlock);
 
-        if (dev->input_panic || dev->output_panic) {
+        if (cdev->input_panic || cdev->output_panic) {
                 ptr = SNDRV_PCM_POS_XRUN;
                 goto unlock;
         }
 
         if (sub->stream == SNDRV_PCM_STREAM_PLAYBACK)
                 ptr = bytes_to_frames(sub->runtime,
-                                        dev->audio_out_buf_pos[index]);
+                                        cdev->audio_out_buf_pos[index]);
         else
                 ptr = bytes_to_frames(sub->runtime,
-                                        dev->audio_in_buf_pos[index]);
+                                        cdev->audio_in_buf_pos[index]);
 
 unlock:
-        spin_unlock(&dev->spinlock);
+        spin_unlock(&cdev->spinlock);
         return ptr;
 }
 
@@ -340,21 +348,21 @@ static struct snd_pcm_ops snd_usb_caiaq_ops = {
         .pointer =      snd_usb_caiaq_pcm_pointer
 };
 
-static void check_for_elapsed_periods(struct snd_usb_caiaqdev *dev,
+static void check_for_elapsed_periods(struct snd_usb_caiaqdev *cdev,
                                       struct snd_pcm_substream **subs)
 {
         int stream, pb, *cnt;
         struct snd_pcm_substream *sub;
 
-        for (stream = 0; stream < dev->n_streams; stream++) {
+        for (stream = 0; stream < cdev->n_streams; stream++) {
                 sub = subs[stream];
                 if (!sub)
                         continue;
 
                 pb = snd_pcm_lib_period_bytes(sub);
                 cnt = (sub->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-                                        &dev->period_out_count[stream] :
-                                        &dev->period_in_count[stream];
+                                        &cdev->period_out_count[stream] :
+                                        &cdev->period_in_count[stream];
 
                 if (*cnt >= pb) {
                         snd_pcm_period_elapsed(sub);
@@ -363,7 +371,7 @@ static void check_for_elapsed_periods(struct snd_usb_caiaqdev *dev,
         }
 }
 
-static void read_in_urb_mode0(struct snd_usb_caiaqdev *dev,
+static void read_in_urb_mode0(struct snd_usb_caiaqdev *cdev,
                               const struct urb *urb,
                               const struct usb_iso_packet_descriptor *iso)
 {
@@ -371,27 +379,27 @@ static void read_in_urb_mode0(struct snd_usb_caiaqdev *dev,
         struct snd_pcm_substream *sub;
         int stream, i;
 
-        if (all_substreams_zero(dev->sub_capture))
+        if (all_substreams_zero(cdev->sub_capture))
                 return;
 
         for (i = 0; i < iso->actual_length;) {
-                for (stream = 0; stream < dev->n_streams; stream++, i++) {
-                        sub = dev->sub_capture[stream];
+                for (stream = 0; stream < cdev->n_streams; stream++, i++) {
+                        sub = cdev->sub_capture[stream];
                         if (sub) {
                                 struct snd_pcm_runtime *rt = sub->runtime;
                                 char *audio_buf = rt->dma_area;
                                 int sz = frames_to_bytes(rt, rt->buffer_size);
-                                audio_buf[dev->audio_in_buf_pos[stream]++]
+                                audio_buf[cdev->audio_in_buf_pos[stream]++]
                                         = usb_buf[i];
-                                dev->period_in_count[stream]++;
-                                if (dev->audio_in_buf_pos[stream] == sz)
-                                        dev->audio_in_buf_pos[stream] = 0;
+                                cdev->period_in_count[stream]++;
+                                if (cdev->audio_in_buf_pos[stream] == sz)
+                                        cdev->audio_in_buf_pos[stream] = 0;
                         }
                 }
         }
 }
 
-static void read_in_urb_mode2(struct snd_usb_caiaqdev *dev,
+static void read_in_urb_mode2(struct snd_usb_caiaqdev *cdev,
                               const struct urb *urb,
                               const struct usb_iso_packet_descriptor *iso)
 {
@@ -401,48 +409,49 @@ static void read_in_urb_mode2(struct snd_usb_caiaqdev *dev,
         int stream, i;
 
         for (i = 0; i < iso->actual_length;) {
-                if (i % (dev->n_streams * BYTES_PER_SAMPLE_USB) == 0) {
+                if (i % (cdev->n_streams * BYTES_PER_SAMPLE_USB) == 0) {
                         for (stream = 0;
-                             stream < dev->n_streams;
+                             stream < cdev->n_streams;
                              stream++, i++) {
-                                if (dev->first_packet)
+                                if (cdev->first_packet)
                                         continue;
 
-                                check_byte = MAKE_CHECKBYTE(dev, stream, i);
+                                check_byte = MAKE_CHECKBYTE(cdev, stream, i);
 
                                 if ((usb_buf[i] & 0x3f) != check_byte)
-                                        dev->input_panic = 1;
+                                        cdev->input_panic = 1;
 
                                 if (usb_buf[i] & 0x80)
-                                        dev->output_panic = 1;
+                                        cdev->output_panic = 1;
                         }
                 }
-                dev->first_packet = 0;
+                cdev->first_packet = 0;
 
-                for (stream = 0; stream < dev->n_streams; stream++, i++) {
-                        sub = dev->sub_capture[stream];
-                        if (dev->input_panic)
+                for (stream = 0; stream < cdev->n_streams; stream++, i++) {
+                        sub = cdev->sub_capture[stream];
+                        if (cdev->input_panic)
                                 usb_buf[i] = 0;
 
                         if (sub) {
                                 struct snd_pcm_runtime *rt = sub->runtime;
                                 char *audio_buf = rt->dma_area;
                                 int sz = frames_to_bytes(rt, rt->buffer_size);
-                                audio_buf[dev->audio_in_buf_pos[stream]++] =
+                                audio_buf[cdev->audio_in_buf_pos[stream]++] =
                                         usb_buf[i];
-                                dev->period_in_count[stream]++;
-                                if (dev->audio_in_buf_pos[stream] == sz)
-                                        dev->audio_in_buf_pos[stream] = 0;
+                                cdev->period_in_count[stream]++;
+                                if (cdev->audio_in_buf_pos[stream] == sz)
+                                        cdev->audio_in_buf_pos[stream] = 0;
                         }
                 }
         }
 }
 
-static void read_in_urb_mode3(struct snd_usb_caiaqdev *dev,
+static void read_in_urb_mode3(struct snd_usb_caiaqdev *cdev,
                               const struct urb *urb,
                               const struct usb_iso_packet_descriptor *iso)
 {
         unsigned char *usb_buf = urb->transfer_buffer + iso->offset;
+        struct device *dev = caiaqdev_to_dev(cdev);
         int stream, i;
 
         /* paranoia check */
@@ -450,12 +459,12 @@ static void read_in_urb_mode3(struct snd_usb_caiaqdev *dev,
                 return;
 
         for (i = 0; i < iso->actual_length;) {
-                for (stream = 0; stream < dev->n_streams; stream++) {
-                        struct snd_pcm_substream *sub = dev->sub_capture[stream];
+                for (stream = 0; stream < cdev->n_streams; stream++) {
+                        struct snd_pcm_substream *sub = cdev->sub_capture[stream];
                         char *audio_buf = NULL;
                         int c, n, sz = 0;
 
-                        if (sub && !dev->input_panic) {
+                        if (sub && !cdev->input_panic) {
                                 struct snd_pcm_runtime *rt = sub->runtime;
                                 audio_buf = rt->dma_area;
                                 sz = frames_to_bytes(rt, rt->buffer_size);
@@ -465,23 +474,23 @@ static void read_in_urb_mode3(struct snd_usb_caiaqdev *dev,
                                 /* 3 audio data bytes, followed by 1 check byte */
                                 if (audio_buf) {
                                         for (n = 0; n < BYTES_PER_SAMPLE; n++) {
-                                                audio_buf[dev->audio_in_buf_pos[stream]++] = usb_buf[i+n];
+                                                audio_buf[cdev->audio_in_buf_pos[stream]++] = usb_buf[i+n];
 
-                                                if (dev->audio_in_buf_pos[stream] == sz)
-                                                        dev->audio_in_buf_pos[stream] = 0;
+                                                if (cdev->audio_in_buf_pos[stream] == sz)
+                                                        cdev->audio_in_buf_pos[stream] = 0;
                                         }
 
-                                        dev->period_in_count[stream] += BYTES_PER_SAMPLE;
+                                        cdev->period_in_count[stream] += BYTES_PER_SAMPLE;
                                 }
 
                                 i += BYTES_PER_SAMPLE;
 
                                 if (usb_buf[i] != ((stream << 1) | c) &&
-                                    !dev->first_packet) {
-                                        if (!dev->input_panic)
-                                                printk(" EXPECTED: %02x got %02x, c %d, stream %d, i %d\n",
-                                                        ((stream << 1) | c), usb_buf[i], c, stream, i);
-                                        dev->input_panic = 1;
+                                    !cdev->first_packet) {
+                                        if (!cdev->input_panic)
+                                                dev_warn(dev, " EXPECTED: %02x got %02x, c %d, stream %d, i %d\n",
+                                                         ((stream << 1) | c), usb_buf[i], c, stream, i);
+                                        cdev->input_panic = 1;
                                 }
 
                                 i++;
@@ -489,41 +498,43 @@ static void read_in_urb_mode3(struct snd_usb_caiaqdev *dev,
                 }
         }
 
-        if (dev->first_packet > 0)
-                dev->first_packet--;
+        if (cdev->first_packet > 0)
+                cdev->first_packet--;
 }
 
-static void read_in_urb(struct snd_usb_caiaqdev *dev,
+static void read_in_urb(struct snd_usb_caiaqdev *cdev,
                         const struct urb *urb,
                         const struct usb_iso_packet_descriptor *iso)
 {
-        if (!dev->streaming)
+        struct device *dev = caiaqdev_to_dev(cdev);
+
+        if (!cdev->streaming)
                 return;
 
-        if (iso->actual_length < dev->bpp)
+        if (iso->actual_length < cdev->bpp)
                 return;
 
-        switch (dev->spec.data_alignment) {
+        switch (cdev->spec.data_alignment) {
         case 0:
-                read_in_urb_mode0(dev, urb, iso);
+                read_in_urb_mode0(cdev, urb, iso);
                 break;
         case 2:
-                read_in_urb_mode2(dev, urb, iso);
+                read_in_urb_mode2(cdev, urb, iso);
                 break;
         case 3:
-                read_in_urb_mode3(dev, urb, iso);
+                read_in_urb_mode3(cdev, urb, iso);
                 break;
         }
 
-        if ((dev->input_panic || dev->output_panic) && !dev->warned) {
-                debug("streaming error detected %s %s\n",
-                                dev->input_panic ? "(input)" : "",
-                                dev->output_panic ? "(output)" : "");
-                dev->warned = 1;
+        if ((cdev->input_panic || cdev->output_panic) && !cdev->warned) {
+                dev_warn(dev, "streaming error detected %s %s\n",
+                                cdev->input_panic ? "(input)" : "",
+                                cdev->output_panic ? "(output)" : "");
+                cdev->warned = 1;
         }
 }
 
-static void fill_out_urb_mode_0(struct snd_usb_caiaqdev *dev,
+static void fill_out_urb_mode_0(struct snd_usb_caiaqdev *cdev,
                                 struct urb *urb,
                                 const struct usb_iso_packet_descriptor *iso)
 {
@@ -532,32 +543,32 @@ static void fill_out_urb_mode_0(struct snd_usb_caiaqdev *dev,
         int stream, i;
 
         for (i = 0; i < iso->length;) {
-                for (stream = 0; stream < dev->n_streams; stream++, i++) {
-                        sub = dev->sub_playback[stream];
+                for (stream = 0; stream < cdev->n_streams; stream++, i++) {
+                        sub = cdev->sub_playback[stream];
                         if (sub) {
                                 struct snd_pcm_runtime *rt = sub->runtime;
                                 char *audio_buf = rt->dma_area;
                                 int sz = frames_to_bytes(rt, rt->buffer_size);
                                 usb_buf[i] =
-                                        audio_buf[dev->audio_out_buf_pos[stream]];
-                                dev->period_out_count[stream]++;
-                                dev->audio_out_buf_pos[stream]++;
-                                if (dev->audio_out_buf_pos[stream] == sz)
-                                        dev->audio_out_buf_pos[stream] = 0;
+                                        audio_buf[cdev->audio_out_buf_pos[stream]];
+                                cdev->period_out_count[stream]++;
+                                cdev->audio_out_buf_pos[stream]++;
+                                if (cdev->audio_out_buf_pos[stream] == sz)
+                                        cdev->audio_out_buf_pos[stream] = 0;
                         } else
                                 usb_buf[i] = 0;
                 }
 
                 /* fill in the check bytes */
-                if (dev->spec.data_alignment == 2 &&
-                    i % (dev->n_streams * BYTES_PER_SAMPLE_USB) ==
-                        (dev->n_streams * CHANNELS_PER_STREAM))
-                        for (stream = 0; stream < dev->n_streams; stream++, i++)
-                                usb_buf[i] = MAKE_CHECKBYTE(dev, stream, i);
+                if (cdev->spec.data_alignment == 2 &&
+                    i % (cdev->n_streams * BYTES_PER_SAMPLE_USB) ==
+                        (cdev->n_streams * CHANNELS_PER_STREAM))
+                        for (stream = 0; stream < cdev->n_streams; stream++, i++)
+                                usb_buf[i] = MAKE_CHECKBYTE(cdev, stream, i);
         }
 }
 
-static void fill_out_urb_mode_3(struct snd_usb_caiaqdev *dev,
+static void fill_out_urb_mode_3(struct snd_usb_caiaqdev *cdev,
                                 struct urb *urb,
                                 const struct usb_iso_packet_descriptor *iso)
 {
@@ -565,8 +576,8 @@ static void fill_out_urb_mode_3(struct snd_usb_caiaqdev *dev,
         int stream, i;
 
         for (i = 0; i < iso->length;) {
-                for (stream = 0; stream < dev->n_streams; stream++) {
-                        struct snd_pcm_substream *sub = dev->sub_playback[stream];
+                for (stream = 0; stream < cdev->n_streams; stream++) {
+                        struct snd_pcm_substream *sub = cdev->sub_playback[stream];
                         char *audio_buf = NULL;
                         int c, n, sz = 0;
 
@@ -579,17 +590,17 @@ static void fill_out_urb_mode_3(struct snd_usb_caiaqdev *dev,
                         for (c = 0; c < CHANNELS_PER_STREAM; c++) {
                                 for (n = 0; n < BYTES_PER_SAMPLE; n++) {
                                         if (audio_buf) {
-                                                usb_buf[i+n] = audio_buf[dev->audio_out_buf_pos[stream]++];
+                                                usb_buf[i+n] = audio_buf[cdev->audio_out_buf_pos[stream]++];
 
-                                                if (dev->audio_out_buf_pos[stream] == sz)
-                                                        dev->audio_out_buf_pos[stream] = 0;
+                                                if (cdev->audio_out_buf_pos[stream] == sz)
+                                                        cdev->audio_out_buf_pos[stream] = 0;
                                         } else {
                                                 usb_buf[i+n] = 0;
                                         }
                                 }
 
                                 if (audio_buf)
-                                        dev->period_out_count[stream] += BYTES_PER_SAMPLE;
+                                        cdev->period_out_count[stream] += BYTES_PER_SAMPLE;
 
                                 i += BYTES_PER_SAMPLE;
 
@@ -600,17 +611,17 @@ static void fill_out_urb_mode_3(struct snd_usb_caiaqdev *dev,
         }
 }
 
-static inline void fill_out_urb(struct snd_usb_caiaqdev *dev,
+static inline void fill_out_urb(struct snd_usb_caiaqdev *cdev,
                                 struct urb *urb,
                                 const struct usb_iso_packet_descriptor *iso)
 {
-        switch (dev->spec.data_alignment) {
+        switch (cdev->spec.data_alignment) {
         case 0:
         case 2:
-                fill_out_urb_mode_0(dev, urb, iso);
+                fill_out_urb_mode_0(cdev, urb, iso);
                 break;
         case 3:
-                fill_out_urb_mode_3(dev, urb, iso);
+                fill_out_urb_mode_3(cdev, urb, iso);
                 break;
         }
 }
@@ -618,7 +629,8 @@ static inline void fill_out_urb(struct snd_usb_caiaqdev *dev,
 static void read_completed(struct urb *urb)
 {
         struct snd_usb_caiaq_cb_info *info = urb->context;
-        struct snd_usb_caiaqdev *dev;
+        struct snd_usb_caiaqdev *cdev;
+        struct device *dev;
         struct urb *out = NULL;
         int i, frame, len, send_it = 0, outframe = 0;
         size_t offset = 0;
@@ -626,20 +638,21 @@ static void read_completed(struct urb *urb)
         if (urb->status || !info)
                 return;
 
-        dev = info->dev;
+        cdev = info->cdev;
+        dev = caiaqdev_to_dev(cdev);
 
-        if (!dev->streaming)
+        if (!cdev->streaming)
                 return;
 
         /* find an unused output urb that is unused */
         for (i = 0; i < N_URBS; i++)
-                if (test_and_set_bit(i, &dev->outurb_active_mask) == 0) {
-                        out = dev->data_urbs_out[i];
+                if (test_and_set_bit(i, &cdev->outurb_active_mask) == 0) {
+                        out = cdev->data_urbs_out[i];
                         break;
                 }
 
         if (!out) {
-                log("Unable to find an output urb to use\n");
+                dev_err(dev, "Unable to find an output urb to use\n");
                 goto requeue;
         }
 
@@ -656,12 +669,12 @@ static void read_completed(struct urb *urb)
                 offset += len;
 
                 if (len > 0) {
-                        spin_lock(&dev->spinlock);
-                        fill_out_urb(dev, out, &out->iso_frame_desc[outframe]);
-                        read_in_urb(dev, urb, &urb->iso_frame_desc[frame]);
-                        spin_unlock(&dev->spinlock);
-                        check_for_elapsed_periods(dev, dev->sub_playback);
-                        check_for_elapsed_periods(dev, dev->sub_capture);
+                        spin_lock(&cdev->spinlock);
+                        fill_out_urb(cdev, out, &out->iso_frame_desc[outframe]);
+                        read_in_urb(cdev, urb, &urb->iso_frame_desc[frame]);
+                        spin_unlock(&cdev->spinlock);
+                        check_for_elapsed_periods(cdev, cdev->sub_playback);
+                        check_for_elapsed_periods(cdev, cdev->sub_capture);
                         send_it = 1;
                 }
 
@@ -674,7 +687,7 @@ static void read_completed(struct urb *urb)
                 usb_submit_urb(out, GFP_ATOMIC);
         } else {
                 struct snd_usb_caiaq_cb_info *oinfo = out->context;
-                clear_bit(oinfo->index, &dev->outurb_active_mask);
+                clear_bit(oinfo->index, &cdev->outurb_active_mask);
         }
 
 requeue:
@@ -693,21 +706,22 @@ requeue:
 static void write_completed(struct urb *urb)
 {
         struct snd_usb_caiaq_cb_info *info = urb->context;
-        struct snd_usb_caiaqdev *dev = info->dev;
+        struct snd_usb_caiaqdev *cdev = info->cdev;
 
-        if (!dev->output_running) {
-                dev->output_running = 1;
-                wake_up(&dev->prepare_wait_queue);
+        if (!cdev->output_running) {
+                cdev->output_running = 1;
+                wake_up(&cdev->prepare_wait_queue);
         }
 
-        clear_bit(info->index, &dev->outurb_active_mask);
+        clear_bit(info->index, &cdev->outurb_active_mask);
 }
 
-static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret)
+static struct urb **alloc_urbs(struct snd_usb_caiaqdev *cdev, int dir, int *ret)
 {
         int i, frame;
         struct urb **urbs;
-        struct usb_device *usb_dev = dev->chip.dev;
+        struct usb_device *usb_dev = cdev->chip.dev;
+        struct device *dev = caiaqdev_to_dev(cdev);
         unsigned int pipe;
 
         pipe = (dir == SNDRV_PCM_STREAM_PLAYBACK) ?
@@ -716,7 +730,7 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret)
 
         urbs = kmalloc(N_URBS * sizeof(*urbs), GFP_KERNEL);
         if (!urbs) {
-                log("unable to kmalloc() urbs, OOM!?\n");
+                dev_err(dev, "unable to kmalloc() urbs, OOM!?\n");
                 *ret = -ENOMEM;
                 return NULL;
         }
@@ -724,7 +738,7 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret)
         for (i = 0; i < N_URBS; i++) {
                 urbs[i] = usb_alloc_urb(FRAMES_PER_URB, GFP_KERNEL);
                 if (!urbs[i]) {
-                        log("unable to usb_alloc_urb(), OOM!?\n");
+                        dev_err(dev, "unable to usb_alloc_urb(), OOM!?\n");
                         *ret = -ENOMEM;
                         return urbs;
                 }
@@ -732,7 +746,7 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret)
                 urbs[i]->transfer_buffer =
                         kmalloc(FRAMES_PER_URB * BYTES_PER_FRAME, GFP_KERNEL);
                 if (!urbs[i]->transfer_buffer) {
-                        log("unable to kmalloc() transfer buffer, OOM!?\n");
+                        dev_err(dev, "unable to kmalloc() transfer buffer, OOM!?\n");
                         *ret = -ENOMEM;
                         return urbs;
                 }
@@ -749,7 +763,7 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret)
                 urbs[i]->pipe = pipe;
                 urbs[i]->transfer_buffer_length = FRAMES_PER_URB
                                                 * BYTES_PER_FRAME;
-                urbs[i]->context = &dev->data_cb_info[i];
+                urbs[i]->context = &cdev->data_cb_info[i];
                 urbs[i]->interval = 1;
                 urbs[i]->transfer_flags = URB_ISO_ASAP;
                 urbs[i]->number_of_packets = FRAMES_PER_URB;
@@ -780,110 +794,113 @@ static void free_urbs(struct urb **urbs)
         kfree(urbs);
 }
 
-int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
+int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *cdev)
 {
         int i, ret;
+        struct device *dev = caiaqdev_to_dev(cdev);
 
-        dev->n_audio_in  = max(dev->spec.num_analog_audio_in,
-                               dev->spec.num_digital_audio_in) /
+        cdev->n_audio_in  = max(cdev->spec.num_analog_audio_in,
+                               cdev->spec.num_digital_audio_in) /
                                 CHANNELS_PER_STREAM;
-        dev->n_audio_out = max(dev->spec.num_analog_audio_out,
-                               dev->spec.num_digital_audio_out) /
+        cdev->n_audio_out = max(cdev->spec.num_analog_audio_out,
+                               cdev->spec.num_digital_audio_out) /
                                 CHANNELS_PER_STREAM;
-        dev->n_streams = max(dev->n_audio_in, dev->n_audio_out);
+        cdev->n_streams = max(cdev->n_audio_in, cdev->n_audio_out);
 
-        debug("dev->n_audio_in = %d\n", dev->n_audio_in);
-        debug("dev->n_audio_out = %d\n", dev->n_audio_out);
-        debug("dev->n_streams = %d\n", dev->n_streams);
+        dev_dbg(dev, "cdev->n_audio_in = %d\n", cdev->n_audio_in);
+        dev_dbg(dev, "cdev->n_audio_out = %d\n", cdev->n_audio_out);
+        dev_dbg(dev, "cdev->n_streams = %d\n", cdev->n_streams);
 
-        if (dev->n_streams > MAX_STREAMS) {
-                log("unable to initialize device, too many streams.\n");
+        if (cdev->n_streams > MAX_STREAMS) {
+                dev_err(dev, "unable to initialize device, too many streams.\n");
                 return -EINVAL;
         }
 
-        ret = snd_pcm_new(dev->chip.card, dev->product_name, 0,
-                        dev->n_audio_out, dev->n_audio_in, &dev->pcm);
+        ret = snd_pcm_new(cdev->chip.card, cdev->product_name, 0,
+                        cdev->n_audio_out, cdev->n_audio_in, &cdev->pcm);
 
         if (ret < 0) {
-                log("snd_pcm_new() returned %d\n", ret);
+                dev_err(dev, "snd_pcm_new() returned %d\n", ret);
                 return ret;
         }
 
-        dev->pcm->private_data = dev;
-        strlcpy(dev->pcm->name, dev->product_name, sizeof(dev->pcm->name));
+        cdev->pcm->private_data = cdev;
+        strlcpy(cdev->pcm->name, cdev->product_name, sizeof(cdev->pcm->name));
 
-        memset(dev->sub_playback, 0, sizeof(dev->sub_playback));
-        memset(dev->sub_capture, 0, sizeof(dev->sub_capture));
+        memset(cdev->sub_playback, 0, sizeof(cdev->sub_playback));
+        memset(cdev->sub_capture, 0, sizeof(cdev->sub_capture));
 
-        memcpy(&dev->pcm_info, &snd_usb_caiaq_pcm_hardware,
+        memcpy(&cdev->pcm_info, &snd_usb_caiaq_pcm_hardware,
                         sizeof(snd_usb_caiaq_pcm_hardware));
 
         /* setup samplerates */
-        dev->samplerates = dev->pcm_info.rates;
-        switch (dev->chip.usb_id) {
+        cdev->samplerates = cdev->pcm_info.rates;
+        switch (cdev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_SESSIONIO):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_GUITARRIGMOBILE):
-                dev->samplerates |= SNDRV_PCM_RATE_192000;
+                cdev->samplerates |= SNDRV_PCM_RATE_192000;
                 /* fall thru */
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO2DJ):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORAUDIO2):
-                dev->samplerates |= SNDRV_PCM_RATE_88200;
+                cdev->samplerates |= SNDRV_PCM_RATE_88200;
                 break;
         }
 
-        snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_PLAYBACK,
+        snd_pcm_set_ops(cdev->pcm, SNDRV_PCM_STREAM_PLAYBACK,
                                 &snd_usb_caiaq_ops);
-        snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_CAPTURE,
+        snd_pcm_set_ops(cdev->pcm, SNDRV_PCM_STREAM_CAPTURE,
                                 &snd_usb_caiaq_ops);
 
-        snd_pcm_lib_preallocate_pages_for_all(dev->pcm,
+        snd_pcm_lib_preallocate_pages_for_all(cdev->pcm,
                                         SNDRV_DMA_TYPE_CONTINUOUS,
                                         snd_dma_continuous_data(GFP_KERNEL),
                                         MAX_BUFFER_SIZE, MAX_BUFFER_SIZE);
 
-        dev->data_cb_info =
+        cdev->data_cb_info =
                 kmalloc(sizeof(struct snd_usb_caiaq_cb_info) * N_URBS,
                                         GFP_KERNEL);
 
-        if (!dev->data_cb_info)
+        if (!cdev->data_cb_info)
                 return -ENOMEM;
 
-        dev->outurb_active_mask = 0;
-        BUILD_BUG_ON(N_URBS > (sizeof(dev->outurb_active_mask) * 8));
+        cdev->outurb_active_mask = 0;
+        BUILD_BUG_ON(N_URBS > (sizeof(cdev->outurb_active_mask) * 8));
 
         for (i = 0; i < N_URBS; i++) {
-                dev->data_cb_info[i].dev = dev;
-                dev->data_cb_info[i].index = i;
+                cdev->data_cb_info[i].cdev = cdev;
+                cdev->data_cb_info[i].index = i;
         }
 
-        dev->data_urbs_in = alloc_urbs(dev, SNDRV_PCM_STREAM_CAPTURE, &ret);
+        cdev->data_urbs_in = alloc_urbs(cdev, SNDRV_PCM_STREAM_CAPTURE, &ret);
         if (ret < 0) {
-                kfree(dev->data_cb_info);
-                free_urbs(dev->data_urbs_in);
+                kfree(cdev->data_cb_info);
+                free_urbs(cdev->data_urbs_in);
                 return ret;
         }
 
-        dev->data_urbs_out = alloc_urbs(dev, SNDRV_PCM_STREAM_PLAYBACK, &ret);
+        cdev->data_urbs_out = alloc_urbs(cdev, SNDRV_PCM_STREAM_PLAYBACK, &ret);
         if (ret < 0) {
-                kfree(dev->data_cb_info);
-                free_urbs(dev->data_urbs_in);
-                free_urbs(dev->data_urbs_out);
+                kfree(cdev->data_cb_info);
+                free_urbs(cdev->data_urbs_in);
+                free_urbs(cdev->data_urbs_out);
                 return ret;
         }
 
         return 0;
 }
 
-void snd_usb_caiaq_audio_free(struct snd_usb_caiaqdev *dev)
+void snd_usb_caiaq_audio_free(struct snd_usb_caiaqdev *cdev)
 {
-        debug("%s(%p)\n", __func__, dev);
-        stream_stop(dev);
-        free_urbs(dev->data_urbs_in);
-        free_urbs(dev->data_urbs_out);
-        kfree(dev->data_cb_info);
+        struct device *dev = caiaqdev_to_dev(cdev);
+
+        dev_dbg(dev, "%s(%p)\n", __func__, cdev);
+        stream_stop(cdev);
+        free_urbs(cdev->data_urbs_in);
+        free_urbs(cdev->data_urbs_out);
+        kfree(cdev->data_cb_info);
 }
 
diff --git a/sound/usb/caiaq/audio.h b/sound/usb/caiaq/audio.h
index 8ab1f8d9529e..bdf155300a8a 100644
--- a/sound/usb/caiaq/audio.h
+++ b/sound/usb/caiaq/audio.h
@@ -1,7 +1,7 @@
 #ifndef CAIAQ_AUDIO_H
 #define CAIAQ_AUDIO_H
 
-int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev);
-void snd_usb_caiaq_audio_free(struct snd_usb_caiaqdev *dev);
+int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *cdev);
+void snd_usb_caiaq_audio_free(struct snd_usb_caiaqdev *cdev);
 
 #endif /* CAIAQ_AUDIO_H */
diff --git a/sound/usb/caiaq/control.c b/sound/usb/caiaq/control.c
index adb8d03267a0..ae6b50f9ed56 100644
--- a/sound/usb/caiaq/control.c
+++ b/sound/usb/caiaq/control.c
@@ -17,6 +17,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
+#include <linux/device.h>
 #include <linux/init.h>
 #include <linux/usb.h>
 #include <sound/control.h>
@@ -32,7 +33,7 @@ static int control_info(struct snd_kcontrol *kcontrol,
                         struct snd_ctl_elem_info *uinfo)
 {
         struct snd_usb_audio *chip = snd_kcontrol_chip(kcontrol);
-        struct snd_usb_caiaqdev *dev = caiaqdev(chip->card);
+        struct snd_usb_caiaqdev *cdev = caiaqdev(chip->card);
         int pos = kcontrol->private_value;
         int is_intval = pos & CNT_INTVAL;
         int maxval = 63;
@@ -40,7 +41,7 @@ static int control_info(struct snd_kcontrol *kcontrol,
         uinfo->count = 1;
         pos &= ~CNT_INTVAL;
 
-        switch (dev->chip.usb_id) {
+        switch (cdev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):
                 if (pos == 0) {
@@ -78,15 +79,15 @@ static int control_get(struct snd_kcontrol *kcontrol,
                        struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_usb_audio *chip = snd_kcontrol_chip(kcontrol);
-        struct snd_usb_caiaqdev *dev = caiaqdev(chip->card);
+        struct snd_usb_caiaqdev *cdev = caiaqdev(chip->card);
         int pos = kcontrol->private_value;
 
         if (pos & CNT_INTVAL)
                 ucontrol->value.integer.value[0]
-                        = dev->control_state[pos & ~CNT_INTVAL];
+                        = cdev->control_state[pos & ~CNT_INTVAL];
         else
                 ucontrol->value.integer.value[0]
-                        = !!(dev->control_state[pos / 8] & (1 << pos % 8));
+                        = !!(cdev->control_state[pos / 8] & (1 << pos % 8));
 
         return 0;
 }
@@ -95,43 +96,43 @@ static int control_put(struct snd_kcontrol *kcontrol,
                        struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_usb_audio *chip = snd_kcontrol_chip(kcontrol);
-        struct snd_usb_caiaqdev *dev = caiaqdev(chip->card);
+        struct snd_usb_caiaqdev *cdev = caiaqdev(chip->card);
         int pos = kcontrol->private_value;
         int v = ucontrol->value.integer.value[0];
         unsigned char cmd = EP1_CMD_WRITE_IO;
 
-        if (dev->chip.usb_id ==
+        if (cdev->chip.usb_id ==
                 USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1))
                 cmd = EP1_CMD_DIMM_LEDS;
 
         if (pos & CNT_INTVAL) {
                 int i = pos & ~CNT_INTVAL;
 
-                dev->control_state[i] = v;
+                cdev->control_state[i] = v;
 
-                if (dev->chip.usb_id ==
+                if (cdev->chip.usb_id ==
                         USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLS4)) {
                         int actual_len;
 
-                        dev->ep8_out_buf[0] = i;
-                        dev->ep8_out_buf[1] = v;
+                        cdev->ep8_out_buf[0] = i;
+                        cdev->ep8_out_buf[1] = v;
 
-                        usb_bulk_msg(dev->chip.dev,
-                                     usb_sndbulkpipe(dev->chip.dev, 8),
-                                     dev->ep8_out_buf, sizeof(dev->ep8_out_buf),
+                        usb_bulk_msg(cdev->chip.dev,
+                                     usb_sndbulkpipe(cdev->chip.dev, 8),
+                                     cdev->ep8_out_buf, sizeof(cdev->ep8_out_buf),
                                      &actual_len, 200);
                 } else {
-                        snd_usb_caiaq_send_command(dev, cmd,
-                                        dev->control_state, sizeof(dev->control_state));
+                        snd_usb_caiaq_send_command(cdev, cmd,
+                                        cdev->control_state, sizeof(cdev->control_state));
                 }
         } else {
                 if (v)
-                        dev->control_state[pos / 8] |= 1 << (pos % 8);
+                        cdev->control_state[pos / 8] |= 1 << (pos % 8);
                 else
-                        dev->control_state[pos / 8] &= ~(1 << (pos % 8));
+                        cdev->control_state[pos / 8] &= ~(1 << (pos % 8));
 
-                snd_usb_caiaq_send_command(dev, cmd,
-                                dev->control_state, sizeof(dev->control_state));
+                snd_usb_caiaq_send_command(cdev, cmd,
+                                cdev->control_state, sizeof(cdev->control_state));
         }
 
         return 1;
@@ -490,7 +491,7 @@ static struct caiaq_controller kontrols4_controller[] = {
 };
 
 static int add_controls(struct caiaq_controller *c, int num,
-                        struct snd_usb_caiaqdev *dev)
+                        struct snd_usb_caiaqdev *cdev)
 {
         int i, ret;
         struct snd_kcontrol *kc;
@@ -498,8 +499,8 @@ static int add_controls(struct caiaq_controller *c, int num,
         for (i = 0; i < num; i++, c++) {
                 kcontrol_template.name = c->name;
                 kcontrol_template.private_value = c->index;
-                kc = snd_ctl_new1(&kcontrol_template, dev);
-                ret = snd_ctl_add(dev->chip.card, kc);
+                kc = snd_ctl_new1(&kcontrol_template, cdev);
+                ret = snd_ctl_add(cdev->chip.card, kc);
                 if (ret < 0)
                         return ret;
         }
@@ -507,50 +508,50 @@ static int add_controls(struct caiaq_controller *c, int num,
         return 0;
 }
 
-int snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev)
+int snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *cdev)
 {
         int ret = 0;
 
-        switch (dev->chip.usb_id) {
+        switch (cdev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
                 ret = add_controls(ak1_controller,
-                        ARRAY_SIZE(ak1_controller), dev);
+                        ARRAY_SIZE(ak1_controller), cdev);
                 break;
 
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):
                 ret = add_controls(rk2_controller,
-                        ARRAY_SIZE(rk2_controller), dev);
+                        ARRAY_SIZE(rk2_controller), cdev);
                 break;
 
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
                 ret = add_controls(rk3_controller,
-                        ARRAY_SIZE(rk3_controller), dev);
+                        ARRAY_SIZE(rk3_controller), cdev);
                 break;
 
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER2):
                 ret = add_controls(kore_controller,
-                        ARRAY_SIZE(kore_controller), dev);
+                        ARRAY_SIZE(kore_controller), cdev);
                 break;
 
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):
                 ret = add_controls(a8dj_controller,
-                        ARRAY_SIZE(a8dj_controller), dev);
+                        ARRAY_SIZE(a8dj_controller), cdev);
                 break;
 
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO4DJ):
                 ret = add_controls(a4dj_controller,
-                        ARRAY_SIZE(a4dj_controller), dev);
+                        ARRAY_SIZE(a4dj_controller), cdev);
                 break;
 
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):
                 ret = add_controls(kontrolx1_controller,
-                        ARRAY_SIZE(kontrolx1_controller), dev);
+                        ARRAY_SIZE(kontrolx1_controller), cdev);
                 break;
 
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLS4):
                 ret = add_controls(kontrols4_controller,
-                        ARRAY_SIZE(kontrols4_controller), dev);
+                        ARRAY_SIZE(kontrols4_controller), cdev);
                 break;
         }
 
diff --git a/sound/usb/caiaq/control.h b/sound/usb/caiaq/control.h
index 2e7ab1aa4fb3..501c4883aef6 100644
--- a/sound/usb/caiaq/control.h
+++ b/sound/usb/caiaq/control.h
@@ -1,6 +1,6 @@
 #ifndef CAIAQ_CONTROL_H
 #define CAIAQ_CONTROL_H
 
-int snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev);
+int snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *cdev);
 
 #endif /* CAIAQ_CONTROL_H */
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index e4d6dbb0342d..48b63ccc78c7 100644
--- a/sound/usb/caiaq/device.c
+++ b/sound/usb/caiaq/device.c
@@ -20,6 +20,7 @@
 */
 
 #include <linux/moduleparam.h>
+#include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -158,67 +159,68 @@ static struct usb_device_id snd_usb_id_table[] = {
 static void usb_ep1_command_reply_dispatch (struct urb* urb)
 {
         int ret;
-        struct snd_usb_caiaqdev *dev = urb->context;
+        struct device *dev = &urb->dev->dev;
+        struct snd_usb_caiaqdev *cdev = urb->context;
         unsigned char *buf = urb->transfer_buffer;
 
-        if (urb->status || !dev) {
-                log("received EP1 urb->status = %i\n", urb->status);
+        if (urb->status || !cdev) {
+                dev_warn(dev, "received EP1 urb->status = %i\n", urb->status);
                 return;
         }
 
         switch(buf[0]) {
         case EP1_CMD_GET_DEVICE_INFO:
-                memcpy(&dev->spec, buf+1, sizeof(struct caiaq_device_spec));
-                dev->spec.fw_version = le16_to_cpu(dev->spec.fw_version);
-                debug("device spec (firmware %d): audio: %d in, %d out, "
+                memcpy(&cdev->spec, buf+1, sizeof(struct caiaq_device_spec));
+                cdev->spec.fw_version = le16_to_cpu(cdev->spec.fw_version);
+                dev_dbg(dev, "device spec (firmware %d): audio: %d in, %d out, "
                         "MIDI: %d in, %d out, data alignment %d\n",
-                        dev->spec.fw_version,
-                        dev->spec.num_analog_audio_in,
-                        dev->spec.num_analog_audio_out,
-                        dev->spec.num_midi_in,
-                        dev->spec.num_midi_out,
-                        dev->spec.data_alignment);
-
-                dev->spec_received++;
-                wake_up(&dev->ep1_wait_queue);
+                        cdev->spec.fw_version,
+                        cdev->spec.num_analog_audio_in,
+                        cdev->spec.num_analog_audio_out,
+                        cdev->spec.num_midi_in,
+                        cdev->spec.num_midi_out,
+                        cdev->spec.data_alignment);
+
+                cdev->spec_received++;
+                wake_up(&cdev->ep1_wait_queue);
                 break;
         case EP1_CMD_AUDIO_PARAMS:
-                dev->audio_parm_answer = buf[1];
-                wake_up(&dev->ep1_wait_queue);
+                cdev->audio_parm_answer = buf[1];
+                wake_up(&cdev->ep1_wait_queue);
                 break;
         case EP1_CMD_MIDI_READ:
-                snd_usb_caiaq_midi_handle_input(dev, buf[1], buf + 3, buf[2]);
+                snd_usb_caiaq_midi_handle_input(cdev, buf[1], buf + 3, buf[2]);
                 break;
         case EP1_CMD_READ_IO:
-                if (dev->chip.usb_id ==
+                if (cdev->chip.usb_id ==
                         USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ)) {
-                        if (urb->actual_length > sizeof(dev->control_state))
-                                urb->actual_length = sizeof(dev->control_state);
-                        memcpy(dev->control_state, buf + 1, urb->actual_length);
-                        wake_up(&dev->ep1_wait_queue);
+                        if (urb->actual_length > sizeof(cdev->control_state))
+                                urb->actual_length = sizeof(cdev->control_state);
+                        memcpy(cdev->control_state, buf + 1, urb->actual_length);
+                        wake_up(&cdev->ep1_wait_queue);
                         break;
                 }
 #ifdef CONFIG_SND_USB_CAIAQ_INPUT
         case EP1_CMD_READ_ERP:
         case EP1_CMD_READ_ANALOG:
-                snd_usb_caiaq_input_dispatch(dev, buf, urb->actual_length);
+                snd_usb_caiaq_input_dispatch(cdev, buf, urb->actual_length);
 #endif
                 break;
         }
 
-        dev->ep1_in_urb.actual_length = 0;
-        ret = usb_submit_urb(&dev->ep1_in_urb, GFP_ATOMIC);
+        cdev->ep1_in_urb.actual_length = 0;
+        ret = usb_submit_urb(&cdev->ep1_in_urb, GFP_ATOMIC);
         if (ret < 0)
-                log("unable to submit urb. OOM!?\n");
+                dev_err(dev, "unable to submit urb. OOM!?\n");
 }
 
-int snd_usb_caiaq_send_command(struct snd_usb_caiaqdev *dev,
+int snd_usb_caiaq_send_command(struct snd_usb_caiaqdev *cdev,
                                unsigned char command,
                                const unsigned char *buffer,
                                int len)
 {
         int actual_len;
-        struct usb_device *usb_dev = dev->chip.dev;
+        struct usb_device *usb_dev = cdev->chip.dev;
 
         if (!usb_dev)
                 return -EIO;
@@ -227,18 +229,19 @@ int snd_usb_caiaq_send_command(struct snd_usb_caiaqdev *dev,
                 len = EP1_BUFSIZE - 1;
 
         if (buffer && len > 0)
-                memcpy(dev->ep1_out_buf+1, buffer, len);
+                memcpy(cdev->ep1_out_buf+1, buffer, len);
 
-        dev->ep1_out_buf[0] = command;
+        cdev->ep1_out_buf[0] = command;
         return usb_bulk_msg(usb_dev, usb_sndbulkpipe(usb_dev, 1),
-                           dev->ep1_out_buf, len+1, &actual_len, 200);
+                           cdev->ep1_out_buf, len+1, &actual_len, 200);
 }
 
-int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev,
+int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *cdev,
                                     int rate, int depth, int bpp)
 {
         int ret;
         char tmp[5];
+        struct device *dev = caiaqdev_to_dev(cdev);
 
         switch (rate) {
         case 44100:     tmp[0] = SAMPLERATE_44100;   break;
@@ -259,49 +262,50 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev,
         tmp[3] = bpp >> 8;
         tmp[4] = 1; /* packets per microframe */
 
-        debug("setting audio params: %d Hz, %d bits, %d bpp\n",
+        dev_dbg(dev, "setting audio params: %d Hz, %d bits, %d bpp\n",
                 rate, depth, bpp);
 
-        dev->audio_parm_answer = -1;
-        ret = snd_usb_caiaq_send_command(dev, EP1_CMD_AUDIO_PARAMS,
+        cdev->audio_parm_answer = -1;
+        ret = snd_usb_caiaq_send_command(cdev, EP1_CMD_AUDIO_PARAMS,
                                          tmp, sizeof(tmp));
 
         if (ret)
                 return ret;
 
-        if (!wait_event_timeout(dev->ep1_wait_queue,
-            dev->audio_parm_answer >= 0, HZ))
+        if (!wait_event_timeout(cdev->ep1_wait_queue,
+            cdev->audio_parm_answer >= 0, HZ))
                 return -EPIPE;
 
-        if (dev->audio_parm_answer != 1)
-                debug("unable to set the device's audio params\n");
+        if (cdev->audio_parm_answer != 1)
+                dev_dbg(dev, "unable to set the device's audio params\n");
         else
-                dev->bpp = bpp;
+                cdev->bpp = bpp;
 
-        return dev->audio_parm_answer == 1 ? 0 : -EINVAL;
+        return cdev->audio_parm_answer == 1 ? 0 : -EINVAL;
 }
 
-int snd_usb_caiaq_set_auto_msg(struct snd_usb_caiaqdev *dev,
+int snd_usb_caiaq_set_auto_msg(struct snd_usb_caiaqdev *cdev,
                                int digital, int analog, int erp)
 {
         char tmp[3] = { digital, analog, erp };
-        return snd_usb_caiaq_send_command(dev, EP1_CMD_AUTO_MSG,
+        return snd_usb_caiaq_send_command(cdev, EP1_CMD_AUTO_MSG,
                                           tmp, sizeof(tmp));
 }
 
-static void setup_card(struct snd_usb_caiaqdev *dev)
+static void setup_card(struct snd_usb_caiaqdev *cdev)
 {
         int ret;
         char val[4];
+        struct device *dev = caiaqdev_to_dev(cdev);
 
         /* device-specific startup specials */
-        switch (dev->chip.usb_id) {
+        switch (cdev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):
                 /* RigKontrol2 - display centered dash ('-') */
                 val[0] = 0x00;
                 val[1] = 0x00;
                 val[2] = 0x01;
-                snd_usb_caiaq_send_command(dev, EP1_CMD_WRITE_IO, val, 3);
+                snd_usb_caiaq_send_command(cdev, EP1_CMD_WRITE_IO, val, 3);
                 break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
                 /* RigKontrol2 - display two centered dashes ('--') */
@@ -309,69 +313,69 @@ static void setup_card(struct snd_usb_caiaqdev *dev)
                 val[1] = 0x40;
                 val[2] = 0x40;
                 val[3] = 0x00;
-                snd_usb_caiaq_send_command(dev, EP1_CMD_WRITE_IO, val, 4);
+                snd_usb_caiaq_send_command(cdev, EP1_CMD_WRITE_IO, val, 4);
                 break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
                 /* Audio Kontrol 1 - make USB-LED stop blinking */
                 val[0] = 0x00;
-                snd_usb_caiaq_send_command(dev, EP1_CMD_WRITE_IO, val, 1);
+                snd_usb_caiaq_send_command(cdev, EP1_CMD_WRITE_IO, val, 1);
                 break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AUDIO8DJ):
                 /* Audio 8 DJ - trigger read of current settings */
-                dev->control_state[0] = 0xff;
-                snd_usb_caiaq_set_auto_msg(dev, 1, 0, 0);
-                snd_usb_caiaq_send_command(dev, EP1_CMD_READ_IO, NULL, 0);
+                cdev->control_state[0] = 0xff;
+                snd_usb_caiaq_set_auto_msg(cdev, 1, 0, 0);
+                snd_usb_caiaq_send_command(cdev, EP1_CMD_READ_IO, NULL, 0);
 
-                if (!wait_event_timeout(dev->ep1_wait_queue,
-                                        dev->control_state[0] != 0xff, HZ))
+                if (!wait_event_timeout(cdev->ep1_wait_queue,
+                                        cdev->control_state[0] != 0xff, HZ))
                         return;
 
                 /* fix up some defaults */
-                if ((dev->control_state[1] != 2) ||
-                    (dev->control_state[2] != 3) ||
-                    (dev->control_state[4] != 2)) {
-                        dev->control_state[1] = 2;
-                        dev->control_state[2] = 3;
-                        dev->control_state[4] = 2;
-                        snd_usb_caiaq_send_command(dev,
-                                EP1_CMD_WRITE_IO, dev->control_state, 6);
+                if ((cdev->control_state[1] != 2) ||
+                    (cdev->control_state[2] != 3) ||
+                    (cdev->control_state[4] != 2)) {
+                        cdev->control_state[1] = 2;
+                        cdev->control_state[2] = 3;
+                        cdev->control_state[4] = 2;
+                        snd_usb_caiaq_send_command(cdev,
+                                EP1_CMD_WRITE_IO, cdev->control_state, 6);
                 }
 
                 break;
         }
 
-        if (dev->spec.num_analog_audio_out +
-            dev->spec.num_analog_audio_in +
-            dev->spec.num_digital_audio_out +
-            dev->spec.num_digital_audio_in > 0) {
-                ret = snd_usb_caiaq_audio_init(dev);
+        if (cdev->spec.num_analog_audio_out +
+            cdev->spec.num_analog_audio_in +
+            cdev->spec.num_digital_audio_out +
+            cdev->spec.num_digital_audio_in > 0) {
+                ret = snd_usb_caiaq_audio_init(cdev);
                 if (ret < 0)
-                        log("Unable to set up audio system (ret=%d)\n", ret);
+                        dev_err(dev, "Unable to set up audio system (ret=%d)\n", ret);
         }
 
-        if (dev->spec.num_midi_in +
-            dev->spec.num_midi_out > 0) {
-                ret = snd_usb_caiaq_midi_init(dev);
+        if (cdev->spec.num_midi_in +
+            cdev->spec.num_midi_out > 0) {
+                ret = snd_usb_caiaq_midi_init(cdev);
                 if (ret < 0)
-                        log("Unable to set up MIDI system (ret=%d)\n", ret);
+                        dev_err(dev, "Unable to set up MIDI system (ret=%d)\n", ret);
         }
 
 #ifdef CONFIG_SND_USB_CAIAQ_INPUT
-        ret = snd_usb_caiaq_input_init(dev);
+        ret = snd_usb_caiaq_input_init(cdev);
         if (ret < 0)
-                log("Unable to set up input system (ret=%d)\n", ret);
+                dev_err(dev, "Unable to set up input system (ret=%d)\n", ret);
 #endif
 
         /* finally, register the card and all its sub-instances */
-        ret = snd_card_register(dev->chip.card);
+        ret = snd_card_register(cdev->chip.card);
         if (ret < 0) {
-                log("snd_card_register() returned %d\n", ret);
-                snd_card_free(dev->chip.card);
+                dev_err(dev, "snd_card_register() returned %d\n", ret);
+                snd_card_free(cdev->chip.card);
         }
 
-        ret = snd_usb_caiaq_control_init(dev);
+        ret = snd_usb_caiaq_control_init(cdev);
         if (ret < 0)
-                log("Unable to set up control system (ret=%d)\n", ret);
+                dev_err(dev, "Unable to set up control system (ret=%d)\n", ret);
 }
 
 static int create_card(struct usb_device *usb_dev,
@@ -381,7 +385,7 @@ static int create_card(struct usb_device *usb_dev,
         int devnum;
         int err;
         struct snd_card *card;
-        struct snd_usb_caiaqdev *dev;
+        struct snd_usb_caiaqdev *cdev;
 
         for (devnum = 0; devnum < SNDRV_CARDS; devnum++)
                 if (enable[devnum] && !snd_card_used[devnum])
@@ -395,65 +399,66 @@ static int create_card(struct usb_device *usb_dev,
         if (err < 0)
                 return err;
 
-        dev = caiaqdev(card);
-        dev->chip.dev = usb_dev;
-        dev->chip.card = card;
-        dev->chip.usb_id = USB_ID(le16_to_cpu(usb_dev->descriptor.idVendor),
+        cdev = caiaqdev(card);
+        cdev->chip.dev = usb_dev;
+        cdev->chip.card = card;
+        cdev->chip.usb_id = USB_ID(le16_to_cpu(usb_dev->descriptor.idVendor),
                                   le16_to_cpu(usb_dev->descriptor.idProduct));
-        spin_lock_init(&dev->spinlock);
+        spin_lock_init(&cdev->spinlock);
         snd_card_set_dev(card, &intf->dev);
 
         *cardp = card;
         return 0;
 }
 
-static int init_card(struct snd_usb_caiaqdev *dev)
+static int init_card(struct snd_usb_caiaqdev *cdev)
 {
         char *c, usbpath[32];
-        struct usb_device *usb_dev = dev->chip.dev;
-        struct snd_card *card = dev->chip.card;
+        struct usb_device *usb_dev = cdev->chip.dev;
+        struct snd_card *card = cdev->chip.card;
+        struct device *dev = caiaqdev_to_dev(cdev);
         int err, len;
 
         if (usb_set_interface(usb_dev, 0, 1) != 0) {
-                log("can't set alt interface.\n");
+                dev_err(dev, "can't set alt interface.\n");
                 return -EIO;
         }
 
-        usb_init_urb(&dev->ep1_in_urb);
-        usb_init_urb(&dev->midi_out_urb);
+        usb_init_urb(&cdev->ep1_in_urb);
+        usb_init_urb(&cdev->midi_out_urb);
 
-        usb_fill_bulk_urb(&dev->ep1_in_urb, usb_dev,
+        usb_fill_bulk_urb(&cdev->ep1_in_urb, usb_dev,
                           usb_rcvbulkpipe(usb_dev, 0x1),
-                          dev->ep1_in_buf, EP1_BUFSIZE,
-                          usb_ep1_command_reply_dispatch, dev);
+                          cdev->ep1_in_buf, EP1_BUFSIZE,
+                          usb_ep1_command_reply_dispatch, cdev);
 
-        usb_fill_bulk_urb(&dev->midi_out_urb, usb_dev,
+        usb_fill_bulk_urb(&cdev->midi_out_urb, usb_dev,
                           usb_sndbulkpipe(usb_dev, 0x1),
-                          dev->midi_out_buf, EP1_BUFSIZE,
-                          snd_usb_caiaq_midi_output_done, dev);
+                          cdev->midi_out_buf, EP1_BUFSIZE,
+                          snd_usb_caiaq_midi_output_done, cdev);
 
-        init_waitqueue_head(&dev->ep1_wait_queue);
-        init_waitqueue_head(&dev->prepare_wait_queue);
+        init_waitqueue_head(&cdev->ep1_wait_queue);
+        init_waitqueue_head(&cdev->prepare_wait_queue);
 
-        if (usb_submit_urb(&dev->ep1_in_urb, GFP_KERNEL) != 0)
+        if (usb_submit_urb(&cdev->ep1_in_urb, GFP_KERNEL) != 0)
                 return -EIO;
 
-        err = snd_usb_caiaq_send_command(dev, EP1_CMD_GET_DEVICE_INFO, NULL, 0);
+        err = snd_usb_caiaq_send_command(cdev, EP1_CMD_GET_DEVICE_INFO, NULL, 0);
         if (err)
                 return err;
 
-        if (!wait_event_timeout(dev->ep1_wait_queue, dev->spec_received, HZ))
+        if (!wait_event_timeout(cdev->ep1_wait_queue, cdev->spec_received, HZ))
                 return -ENODEV;
 
         usb_string(usb_dev, usb_dev->descriptor.iManufacturer,
-                   dev->vendor_name, CAIAQ_USB_STR_LEN);
+                   cdev->vendor_name, CAIAQ_USB_STR_LEN);
 
         usb_string(usb_dev, usb_dev->descriptor.iProduct,
-                   dev->product_name, CAIAQ_USB_STR_LEN);
+                   cdev->product_name, CAIAQ_USB_STR_LEN);
 
         strlcpy(card->driver, MODNAME, sizeof(card->driver));
-        strlcpy(card->shortname, dev->product_name, sizeof(card->shortname));
-        strlcpy(card->mixername, dev->product_name, sizeof(card->mixername));
+        strlcpy(card->shortname, cdev->product_name, sizeof(card->shortname));
+        strlcpy(card->mixername, cdev->product_name, sizeof(card->mixername));
 
         /* if the id was not passed as module option, fill it with a shortened
          * version of the product string which does not contain any
@@ -473,11 +478,10 @@ static int init_card(struct snd_usb_caiaqdev *dev)
         }
 
         usb_make_path(usb_dev, usbpath, sizeof(usbpath));
-        snprintf(card->longname, sizeof(card->longname),
-                       "%s %s (%s)",
-                       dev->vendor_name, dev->product_name, usbpath);
+        snprintf(card->longname, sizeof(card->longname), "%s %s (%s)",
+                       cdev->vendor_name, cdev->product_name, usbpath);
 
-        setup_card(dev);
+        setup_card(cdev);
         return 0;
 }
 
@@ -486,9 +490,9 @@ static int snd_probe(struct usb_interface *intf,
 {
         int ret;
         struct snd_card *card = NULL;
-        struct usb_device *device = interface_to_usbdev(intf);
+        struct usb_device *usb_dev = interface_to_usbdev(intf);
 
-        ret = create_card(device, intf, &card);
+        ret = create_card(usb_dev, intf, &card);
 
         if (ret < 0)
                 return ret;
@@ -496,7 +500,7 @@ static int snd_probe(struct usb_interface *intf,
         usb_set_intfdata(intf, card);
         ret = init_card(caiaqdev(card));
         if (ret < 0) {
-                log("unable to init card! (ret=%d)\n", ret);
+                dev_err(&usb_dev->dev, "unable to init card! (ret=%d)\n", ret);
                 snd_card_free(card);
                 return ret;
         }
@@ -506,24 +510,25 @@ static int snd_probe(struct usb_interface *intf,
 
 static void snd_disconnect(struct usb_interface *intf)
 {
-        struct snd_usb_caiaqdev *dev;
         struct snd_card *card = usb_get_intfdata(intf);
-
-        debug("%s(%p)\n", __func__, intf);
+        struct device *dev = intf->usb_dev;
+        struct snd_usb_caiaqdev *cdev;
 
         if (!card)
                 return;
 
-        dev = caiaqdev(card);
+        cdev = caiaqdev(card);
+        dev_dbg(dev, "%s(%p)\n", __func__, intf);
+
         snd_card_disconnect(card);
 
 #ifdef CONFIG_SND_USB_CAIAQ_INPUT
-        snd_usb_caiaq_input_free(dev);
+        snd_usb_caiaq_input_free(cdev);
 #endif
-        snd_usb_caiaq_audio_free(dev);
+        snd_usb_caiaq_audio_free(cdev);
 
-        usb_kill_urb(&dev->ep1_in_urb);
-        usb_kill_urb(&dev->midi_out_urb);
+        usb_kill_urb(&cdev->ep1_in_urb);
+        usb_kill_urb(&cdev->midi_out_urb);
 
         snd_card_free(card);
         usb_reset_device(interface_to_usbdev(intf));
@@ -539,4 +544,3 @@ static struct usb_driver snd_usb_driver = {
 };
 
 module_usb_driver(snd_usb_driver);
-
diff --git a/sound/usb/caiaq/device.h b/sound/usb/caiaq/device.h
index 562b0bff9c41..ad102fac6942 100644
--- a/sound/usb/caiaq/device.h
+++ b/sound/usb/caiaq/device.h
@@ -25,16 +25,7 @@
 #define CAIAQ_USB_STR_LEN 0xff
 #define MAX_STREAMS 32
 
-//#define       SND_USB_CAIAQ_DEBUG
-
 #define MODNAME "snd-usb-caiaq"
-#define log(x...) snd_printk(KERN_WARNING MODNAME" log: " x)
-
-#ifdef SND_USB_CAIAQ_DEBUG
-#define debug(x...) snd_printk(KERN_WARNING MODNAME " debug: " x)
-#else
-#define debug(x...) do { } while(0)
-#endif
 
 #define EP1_CMD_GET_DEVICE_INFO 0x1
 #define EP1_CMD_READ_ERP        0x2
@@ -124,15 +115,16 @@ struct snd_usb_caiaqdev {
 };
 
 struct snd_usb_caiaq_cb_info {
-        struct snd_usb_caiaqdev *dev;
+        struct snd_usb_caiaqdev *cdev;
         int index;
 };
 
 #define caiaqdev(c) ((struct snd_usb_caiaqdev*)(c)->private_data)
+#define caiaqdev_to_dev(d)      (d->chip.card->dev)
 
-int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev, int rate, int depth, int bbp);
-int snd_usb_caiaq_set_auto_msg (struct snd_usb_caiaqdev *dev, int digital, int analog, int erp);
-int snd_usb_caiaq_send_command(struct snd_usb_caiaqdev *dev,
+int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *cdev, int rate, int depth, int bbp);
+int snd_usb_caiaq_set_auto_msg (struct snd_usb_caiaqdev *cdev, int digital, int analog, int erp);
+int snd_usb_caiaq_send_command(struct snd_usb_caiaqdev *cdev,
                                unsigned char command,
                                const unsigned char *buffer,
                                int len);
diff --git a/sound/usb/caiaq/input.c b/sound/usb/caiaq/input.c
index 26a121b42c3c..efc70ae915c5 100644
--- a/sound/usb/caiaq/input.c
+++ b/sound/usb/caiaq/input.c
@@ -16,6 +16,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
 
+#include <linux/device.h>
 #include <linux/gfp.h>
 #include <linux/init.h>
 #include <linux/usb.h>
@@ -199,55 +200,55 @@ static unsigned int decode_erp(unsigned char a, unsigned char b)
 #undef HIGH_PEAK
 #undef LOW_PEAK
 
-static inline void snd_caiaq_input_report_abs(struct snd_usb_caiaqdev *dev,
+static inline void snd_caiaq_input_report_abs(struct snd_usb_caiaqdev *cdev,
                                               int axis, const unsigned char *buf,
                                               int offset)
 {
-        input_report_abs(dev->input_dev, axis,
+        input_report_abs(cdev->input_dev, axis,
                          (buf[offset * 2] << 8) | buf[offset * 2 + 1]);
 }
 
-static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev,
+static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *cdev,
                                         const unsigned char *buf,
                                         unsigned int len)
 {
-        struct input_dev *input_dev = dev->input_dev;
+        struct input_dev *input_dev = cdev->input_dev;
 
-        switch (dev->chip.usb_id) {
+        switch (cdev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):
-                snd_caiaq_input_report_abs(dev, ABS_X, buf, 2);
-                snd_caiaq_input_report_abs(dev, ABS_Y, buf, 0);
-                snd_caiaq_input_report_abs(dev, ABS_Z, buf, 1);
+                snd_caiaq_input_report_abs(cdev, ABS_X, buf, 2);
+                snd_caiaq_input_report_abs(cdev, ABS_Y, buf, 0);
+                snd_caiaq_input_report_abs(cdev, ABS_Z, buf, 1);
                 break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER2):
-                snd_caiaq_input_report_abs(dev, ABS_X, buf, 0);
-                snd_caiaq_input_report_abs(dev, ABS_Y, buf, 1);
-                snd_caiaq_input_report_abs(dev, ABS_Z, buf, 2);
+                snd_caiaq_input_report_abs(cdev, ABS_X, buf, 0);
+                snd_caiaq_input_report_abs(cdev, ABS_Y, buf, 1);
+                snd_caiaq_input_report_abs(cdev, ABS_Z, buf, 2);
                 break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):
-                snd_caiaq_input_report_abs(dev, ABS_HAT0X, buf, 4);
-                snd_caiaq_input_report_abs(dev, ABS_HAT0Y, buf, 2);
-                snd_caiaq_input_report_abs(dev, ABS_HAT1X, buf, 6);
-                snd_caiaq_input_report_abs(dev, ABS_HAT1Y, buf, 1);
-                snd_caiaq_input_report_abs(dev, ABS_HAT2X, buf, 7);
-                snd_caiaq_input_report_abs(dev, ABS_HAT2Y, buf, 0);
-                snd_caiaq_input_report_abs(dev, ABS_HAT3X, buf, 5);
-                snd_caiaq_input_report_abs(dev, ABS_HAT3Y, buf, 3);
+                snd_caiaq_input_report_abs(cdev, ABS_HAT0X, buf, 4);
+                snd_caiaq_input_report_abs(cdev, ABS_HAT0Y, buf, 2);
+                snd_caiaq_input_report_abs(cdev, ABS_HAT1X, buf, 6);
+                snd_caiaq_input_report_abs(cdev, ABS_HAT1Y, buf, 1);
+                snd_caiaq_input_report_abs(cdev, ABS_HAT2X, buf, 7);
+                snd_caiaq_input_report_abs(cdev, ABS_HAT2Y, buf, 0);
+                snd_caiaq_input_report_abs(cdev, ABS_HAT3X, buf, 5);
+                snd_caiaq_input_report_abs(cdev, ABS_HAT3Y, buf, 3);
                 break;
         }
 
         input_sync(input_dev);
 }
 
-static void snd_caiaq_input_read_erp(struct snd_usb_caiaqdev *dev,
+static void snd_caiaq_input_read_erp(struct snd_usb_caiaqdev *cdev,
                                      const char *buf, unsigned int len)
 {
-        struct input_dev *input_dev = dev->input_dev;
+        struct input_dev *input_dev = cdev->input_dev;
         int i;
 
-        switch (dev->chip.usb_id) {
+        switch (cdev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
                 i = decode_erp(buf[0], buf[1]);
                 input_report_abs(input_dev, ABS_X, i);
@@ -299,10 +300,10 @@ static void snd_caiaq_input_read_erp(struct snd_usb_caiaqdev *dev,
         }
 }
 
-static void snd_caiaq_input_read_io(struct snd_usb_caiaqdev *dev,
+static void snd_caiaq_input_read_io(struct snd_usb_caiaqdev *cdev,
                                     unsigned char *buf, unsigned int len)
 {
-        struct input_dev *input_dev = dev->input_dev;
+        struct input_dev *input_dev = cdev->input_dev;
         unsigned short *keycode = input_dev->keycode;
         int i;
 
@@ -317,17 +318,17 @@ static void snd_caiaq_input_read_io(struct snd_usb_caiaqdev *dev,
                 input_report_key(input_dev, keycode[i],
                                  buf[i / 8] & (1 << (i % 8)));
 
-        switch (dev->chip.usb_id) {
+        switch (cdev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER2):
-                input_report_abs(dev->input_dev, ABS_MISC, 255 - buf[4]);
+                input_report_abs(cdev->input_dev, ABS_MISC, 255 - buf[4]);
                 break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):
                 /* rotary encoders */
-                input_report_abs(dev->input_dev, ABS_X, buf[5] & 0xf);
-                input_report_abs(dev->input_dev, ABS_Y, buf[5] >> 4);
-                input_report_abs(dev->input_dev, ABS_Z, buf[6] & 0xf);
-                input_report_abs(dev->input_dev, ABS_MISC, buf[6] >> 4);
+                input_report_abs(cdev->input_dev, ABS_X, buf[5] & 0xf);
+                input_report_abs(cdev->input_dev, ABS_Y, buf[5] >> 4);
+                input_report_abs(cdev->input_dev, ABS_Z, buf[6] & 0xf);
+                input_report_abs(cdev->input_dev, ABS_MISC, buf[6] >> 4);
                 break;
         }
 
@@ -336,10 +337,12 @@ static void snd_caiaq_input_read_io(struct snd_usb_caiaqdev *dev,
 
 #define TKS4_MSGBLOCK_SIZE      16
 
-static void snd_usb_caiaq_tks4_dispatch(struct snd_usb_caiaqdev *dev,
+static void snd_usb_caiaq_tks4_dispatch(struct snd_usb_caiaqdev *cdev,
                                         const unsigned char *buf,
                                         unsigned int len)
 {
+        struct device *dev = caiaqdev_to_dev(cdev);
+
         while (len) {
                 unsigned int i, block_id = (buf[0] << 8) | buf[1];
 
@@ -347,126 +350,126 @@ static void snd_usb_caiaq_tks4_dispatch(struct snd_usb_caiaqdev *dev,
                 case 0:
                         /* buttons */
                         for (i = 0; i < KONTROLS4_BUTTONS; i++)
-                                input_report_key(dev->input_dev, KONTROLS4_BUTTON(i),
+                                input_report_key(cdev->input_dev, KONTROLS4_BUTTON(i),
                                                  (buf[4 + (i / 8)] >> (i % 8)) & 1);
                         break;
 
                 case 1:
                         /* left wheel */
-                        input_report_abs(dev->input_dev, KONTROLS4_ABS(36), buf[9] | ((buf[8] & 0x3) << 8));
+                        input_report_abs(cdev->input_dev, KONTROLS4_ABS(36), buf[9] | ((buf[8] & 0x3) << 8));
                         /* right wheel */
-                        input_report_abs(dev->input_dev, KONTROLS4_ABS(37), buf[13] | ((buf[12] & 0x3) << 8));
+                        input_report_abs(cdev->input_dev, KONTROLS4_ABS(37), buf[13] | ((buf[12] & 0x3) << 8));
 
                         /* rotary encoders */
-                        input_report_abs(dev->input_dev, KONTROLS4_ABS(38), buf[3] & 0xf);
-                        input_report_abs(dev->input_dev, KONTROLS4_ABS(39), buf[4] >> 4);
-                        input_report_abs(dev->input_dev, KONTROLS4_ABS(40), buf[4] & 0xf);
-                        input_report_abs(dev->input_dev, KONTROLS4_ABS(41), buf[5] >> 4);
-                        input_report_abs(dev->input_dev, KONTROLS4_ABS(42), buf[5] & 0xf);
-                        input_report_abs(dev->input_dev, KONTROLS4_ABS(43), buf[6] >> 4);
-                        input_report_abs(dev->input_dev, KONTROLS4_ABS(44), buf[6] & 0xf);
-                        input_report_abs(dev->input_dev, KONTROLS4_ABS(45), buf[7] >> 4);
-                        input_report_abs(dev->input_dev, KONTROLS4_ABS(46), buf[7] & 0xf);
+                        input_report_abs(cdev->input_dev, KONTROLS4_ABS(38), buf[3] & 0xf);
+                        input_report_abs(cdev->input_dev, KONTROLS4_ABS(39), buf[4] >> 4);
+                        input_report_abs(cdev->input_dev, KONTROLS4_ABS(40), buf[4] & 0xf);
+                        input_report_abs(cdev->input_dev, KONTROLS4_ABS(41), buf[5] >> 4);
+                        input_report_abs(cdev->input_dev, KONTROLS4_ABS(42), buf[5] & 0xf);
+                        input_report_abs(cdev->input_dev, KONTROLS4_ABS(43), buf[6] >> 4);
+                        input_report_abs(cdev->input_dev, KONTROLS4_ABS(44), buf[6] & 0xf);
+                        input_report_abs(cdev->input_dev, KONTROLS4_ABS(45), buf[7] >> 4);
+                        input_report_abs(cdev->input_dev, KONTROLS4_ABS(46), buf[7] & 0xf);
 
                         break;
                 case 2:
                         /* Volume Fader Channel D */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(0), buf, 1);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(0), buf, 1);
                         /* Volume Fader Channel B */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(1), buf, 2);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(1), buf, 2);
                         /* Volume Fader Channel A */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(2), buf, 3);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(2), buf, 3);
                         /* Volume Fader Channel C */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(3), buf, 4);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(3), buf, 4);
                         /* Loop Volume */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(4), buf, 6);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(4), buf, 6);
                         /* Crossfader */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(7), buf, 7);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(7), buf, 7);
 
                         break;
 
                 case 3:
                         /* Tempo Fader R */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(6), buf, 3);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(6), buf, 3);
                         /* Tempo Fader L */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(5), buf, 4);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(5), buf, 4);
                         /* Mic Volume */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(8), buf, 6);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(8), buf, 6);
                         /* Cue Mix */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(9), buf, 7);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(9), buf, 7);
 
                         break;
 
                 case 4:
                         /* Wheel distance sensor L */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(10), buf, 1);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(10), buf, 1);
                         /* Wheel distance sensor R */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(11), buf, 2);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(11), buf, 2);
                         /* Channel D EQ - Filter */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(12), buf, 3);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(12), buf, 3);
                         /* Channel D EQ - Low */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(13), buf, 4);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(13), buf, 4);
                         /* Channel D EQ - Mid */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(14), buf, 5);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(14), buf, 5);
                         /* Channel D EQ - Hi */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(15), buf, 6);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(15), buf, 6);
                         /* FX2 - dry/wet */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(16), buf, 7);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(16), buf, 7);
 
                         break;
 
                 case 5:
                         /* FX2 - 1 */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(17), buf, 1);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(17), buf, 1);
                         /* FX2 - 2 */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(18), buf, 2);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(18), buf, 2);
                         /* FX2 - 3 */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(19), buf, 3);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(19), buf, 3);
                         /* Channel B EQ - Filter */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(20), buf, 4);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(20), buf, 4);
                         /* Channel B EQ - Low */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(21), buf, 5);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(21), buf, 5);
                         /* Channel B EQ - Mid */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(22), buf, 6);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(22), buf, 6);
                         /* Channel B EQ - Hi */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(23), buf, 7);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(23), buf, 7);
 
                         break;
 
                 case 6:
                         /* Channel A EQ - Filter */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(24), buf, 1);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(24), buf, 1);
                         /* Channel A EQ - Low */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(25), buf, 2);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(25), buf, 2);
                         /* Channel A EQ - Mid */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(26), buf, 3);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(26), buf, 3);
                         /* Channel A EQ - Hi */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(27), buf, 4);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(27), buf, 4);
                         /* Channel C EQ - Filter */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(28), buf, 5);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(28), buf, 5);
                         /* Channel C EQ - Low */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(29), buf, 6);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(29), buf, 6);
                         /* Channel C EQ - Mid */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(30), buf, 7);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(30), buf, 7);
 
                         break;
 
                 case 7:
                         /* Channel C EQ - Hi */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(31), buf, 1);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(31), buf, 1);
                         /* FX1 - wet/dry */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(32), buf, 2);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(32), buf, 2);
                         /* FX1 - 1 */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(33), buf, 3);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(33), buf, 3);
                         /* FX1 - 2 */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(34), buf, 4);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(34), buf, 4);
                         /* FX1 - 3 */
-                        snd_caiaq_input_report_abs(dev, KONTROLS4_ABS(35), buf, 5);
+                        snd_caiaq_input_report_abs(cdev, KONTROLS4_ABS(35), buf, 5);
 
                         break;
 
                 default:
-                        debug("%s(): bogus block (id %d)\n",
+                        dev_dbg(dev, "%s(): bogus block (id %d)\n",
                                 __func__, block_id);
                         return;
                 }
@@ -475,12 +478,12 @@ static void snd_usb_caiaq_tks4_dispatch(struct snd_usb_caiaqdev *dev,
                 buf += TKS4_MSGBLOCK_SIZE;
         }
 
-        input_sync(dev->input_dev);
+        input_sync(cdev->input_dev);
 }
 
 #define MASCHINE_MSGBLOCK_SIZE 2
 
-static void snd_usb_caiaq_maschine_dispatch(struct snd_usb_caiaqdev *dev,
+static void snd_usb_caiaq_maschine_dispatch(struct snd_usb_caiaqdev *cdev,
                                         const unsigned char *buf,
                                         unsigned int len)
 {
@@ -491,65 +494,66 @@ static void snd_usb_caiaq_maschine_dispatch(struct snd_usb_caiaqdev *dev,
                 pressure = be16_to_cpu(buf[i * 2] << 8 | buf[(i * 2) + 1]);
                 pad_id = pressure >> 12;
 
-                input_report_abs(dev->input_dev, MASCHINE_PAD(pad_id), pressure & 0xfff);
+                input_report_abs(cdev->input_dev, MASCHINE_PAD(pad_id), pressure & 0xfff);
         }
 
-        input_sync(dev->input_dev);
+        input_sync(cdev->input_dev);
 }
 
 static void snd_usb_caiaq_ep4_reply_dispatch(struct urb *urb)
 {
-        struct snd_usb_caiaqdev *dev = urb->context;
+        struct snd_usb_caiaqdev *cdev = urb->context;
         unsigned char *buf = urb->transfer_buffer;
+        struct device *dev = &urb->dev->dev;
         int ret;
 
-        if (urb->status || !dev || urb != dev->ep4_in_urb)
+        if (urb->status || !cdev || urb != cdev->ep4_in_urb)
                 return;
 
-        switch (dev->chip.usb_id) {
+        switch (cdev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):
                 if (urb->actual_length < 24)
                         goto requeue;
 
                 if (buf[0] & 0x3)
-                        snd_caiaq_input_read_io(dev, buf + 1, 7);
+                        snd_caiaq_input_read_io(cdev, buf + 1, 7);
 
                 if (buf[0] & 0x4)
-                        snd_caiaq_input_read_analog(dev, buf + 8, 16);
+                        snd_caiaq_input_read_analog(cdev, buf + 8, 16);
 
                 break;
 
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLS4):
-                snd_usb_caiaq_tks4_dispatch(dev, buf, urb->actual_length);
+                snd_usb_caiaq_tks4_dispatch(cdev, buf, urb->actual_length);
                 break;
 
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_MASCHINECONTROLLER):
                 if (urb->actual_length < (MASCHINE_PADS * MASCHINE_MSGBLOCK_SIZE))
                         goto requeue;
 
-                snd_usb_caiaq_maschine_dispatch(dev, buf, urb->actual_length);
+                snd_usb_caiaq_maschine_dispatch(cdev, buf, urb->actual_length);
                 break;
         }
 
 requeue:
-        dev->ep4_in_urb->actual_length = 0;
-        ret = usb_submit_urb(dev->ep4_in_urb, GFP_ATOMIC);
+        cdev->ep4_in_urb->actual_length = 0;
+        ret = usb_submit_urb(cdev->ep4_in_urb, GFP_ATOMIC);
         if (ret < 0)
-                log("unable to submit urb. OOM!?\n");
+                dev_err(dev, "unable to submit urb. OOM!?\n");
 }
 
 static int snd_usb_caiaq_input_open(struct input_dev *idev)
 {
-        struct snd_usb_caiaqdev *dev = input_get_drvdata(idev);
+        struct snd_usb_caiaqdev *cdev = input_get_drvdata(idev);
 
-        if (!dev)
+        if (!cdev)
                 return -EINVAL;
 
-        switch (dev->chip.usb_id) {
+        switch (cdev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLS4):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_MASCHINECONTROLLER):
-                if (usb_submit_urb(dev->ep4_in_urb, GFP_KERNEL) != 0)
+                if (usb_submit_urb(cdev->ep4_in_urb, GFP_KERNEL) != 0)
                         return -EIO;
                 break;
         }
@@ -559,43 +563,43 @@ static int snd_usb_caiaq_input_open(struct input_dev *idev)
 
 static void snd_usb_caiaq_input_close(struct input_dev *idev)
 {
-        struct snd_usb_caiaqdev *dev = input_get_drvdata(idev);
+        struct snd_usb_caiaqdev *cdev = input_get_drvdata(idev);
 
-        if (!dev)
+        if (!cdev)
                 return;
 
-        switch (dev->chip.usb_id) {
+        switch (cdev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLS4):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_MASCHINECONTROLLER):
-                usb_kill_urb(dev->ep4_in_urb);
+                usb_kill_urb(cdev->ep4_in_urb);
                 break;
         }
 }
 
-void snd_usb_caiaq_input_dispatch(struct snd_usb_caiaqdev *dev,
+void snd_usb_caiaq_input_dispatch(struct snd_usb_caiaqdev *cdev,
                                   char *buf,
                                   unsigned int len)
 {
-        if (!dev->input_dev || len < 1)
+        if (!cdev->input_dev || len < 1)
                 return;
 
         switch (buf[0]) {
         case EP1_CMD_READ_ANALOG:
-                snd_caiaq_input_read_analog(dev, buf + 1, len - 1);
+                snd_caiaq_input_read_analog(cdev, buf + 1, len - 1);
                 break;
         case EP1_CMD_READ_ERP:
-                snd_caiaq_input_read_erp(dev, buf + 1, len - 1);
+                snd_caiaq_input_read_erp(cdev, buf + 1, len - 1);
                 break;
         case EP1_CMD_READ_IO:
-                snd_caiaq_input_read_io(dev, buf + 1, len - 1);
+                snd_caiaq_input_read_io(cdev, buf + 1, len - 1);
                 break;
         }
 }
 
-int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
+int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *cdev)
 {
-        struct usb_device *usb_dev = dev->chip.dev;
+        struct usb_device *usb_dev = cdev->chip.dev;
         struct input_dev *input;
         int i, ret = 0;
 
@@ -603,49 +607,49 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
         if (!input)
                 return -ENOMEM;
 
-        usb_make_path(usb_dev, dev->phys, sizeof(dev->phys));
-        strlcat(dev->phys, "/input0", sizeof(dev->phys));
+        usb_make_path(usb_dev, cdev->phys, sizeof(cdev->phys));
+        strlcat(cdev->phys, "/input0", sizeof(cdev->phys));
 
-        input->name = dev->product_name;
-        input->phys = dev->phys;
+        input->name = cdev->product_name;
+        input->phys = cdev->phys;
         usb_to_input_id(usb_dev, &input->id);
         input->dev.parent = &usb_dev->dev;
 
-        input_set_drvdata(input, dev);
+        input_set_drvdata(input, cdev);
 
-        switch (dev->chip.usb_id) {
+        switch (cdev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):
                 input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
                 input->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) |
                         BIT_MASK(ABS_Z);
-                BUILD_BUG_ON(sizeof(dev->keycode) < sizeof(keycode_rk2));
-                memcpy(dev->keycode, keycode_rk2, sizeof(keycode_rk2));
+                BUILD_BUG_ON(sizeof(cdev->keycode) < sizeof(keycode_rk2));
+                memcpy(cdev->keycode, keycode_rk2, sizeof(keycode_rk2));
                 input->keycodemax = ARRAY_SIZE(keycode_rk2);
                 input_set_abs_params(input, ABS_X, 0, 4096, 0, 10);
                 input_set_abs_params(input, ABS_Y, 0, 4096, 0, 10);
                 input_set_abs_params(input, ABS_Z, 0, 4096, 0, 10);
-                snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);
+                snd_usb_caiaq_set_auto_msg(cdev, 1, 10, 0);
                 break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
                 input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
                 input->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) |
                         BIT_MASK(ABS_Z);
-                BUILD_BUG_ON(sizeof(dev->keycode) < sizeof(keycode_rk3));
-                memcpy(dev->keycode, keycode_rk3, sizeof(keycode_rk3));
+                BUILD_BUG_ON(sizeof(cdev->keycode) < sizeof(keycode_rk3));
+                memcpy(cdev->keycode, keycode_rk3, sizeof(keycode_rk3));
                 input->keycodemax = ARRAY_SIZE(keycode_rk3);
                 input_set_abs_params(input, ABS_X, 0, 1024, 0, 10);
                 input_set_abs_params(input, ABS_Y, 0, 1024, 0, 10);
                 input_set_abs_params(input, ABS_Z, 0, 1024, 0, 10);
-                snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);
+                snd_usb_caiaq_set_auto_msg(cdev, 1, 10, 0);
                 break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
                 input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
                 input->absbit[0] = BIT_MASK(ABS_X);
-                BUILD_BUG_ON(sizeof(dev->keycode) < sizeof(keycode_ak1));
-                memcpy(dev->keycode, keycode_ak1, sizeof(keycode_ak1));
+                BUILD_BUG_ON(sizeof(cdev->keycode) < sizeof(keycode_ak1));
+                memcpy(cdev->keycode, keycode_ak1, sizeof(keycode_ak1));
                 input->keycodemax = ARRAY_SIZE(keycode_ak1);
                 input_set_abs_params(input, ABS_X, 0, 999, 0, 10);
-                snd_usb_caiaq_set_auto_msg(dev, 1, 0, 5);
+                snd_usb_caiaq_set_auto_msg(cdev, 1, 0, 5);
                 break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER):
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_KORECONTROLLER2):
@@ -657,8 +661,8 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                                    BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) |
                                    BIT_MASK(ABS_Z);
                 input->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC);
-                BUILD_BUG_ON(sizeof(dev->keycode) < sizeof(keycode_kore));
-                memcpy(dev->keycode, keycode_kore, sizeof(keycode_kore));
+                BUILD_BUG_ON(sizeof(cdev->keycode) < sizeof(keycode_kore));
+                memcpy(cdev->keycode, keycode_kore, sizeof(keycode_kore));
                 input->keycodemax = ARRAY_SIZE(keycode_kore);
                 input_set_abs_params(input, ABS_HAT0X, 0, 999, 0, 10);
                 input_set_abs_params(input, ABS_HAT0Y, 0, 999, 0, 10);
@@ -672,7 +676,7 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                 input_set_abs_params(input, ABS_Y, 0, 4096, 0, 10);
                 input_set_abs_params(input, ABS_Z, 0, 4096, 0, 10);
                 input_set_abs_params(input, ABS_MISC, 0, 255, 0, 1);
-                snd_usb_caiaq_set_auto_msg(dev, 1, 10, 5);
+                snd_usb_caiaq_set_auto_msg(cdev, 1, 10, 5);
                 break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):
                 input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
@@ -683,9 +687,9 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                                    BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) |
                                    BIT_MASK(ABS_Z);
                 input->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC);
-                BUILD_BUG_ON(sizeof(dev->keycode) < KONTROLX1_INPUTS);
+                BUILD_BUG_ON(sizeof(cdev->keycode) < KONTROLX1_INPUTS);
                 for (i = 0; i < KONTROLX1_INPUTS; i++)
-                        dev->keycode[i] = BTN_MISC + i;
+                        cdev->keycode[i] = BTN_MISC + i;
                 input->keycodemax = KONTROLX1_INPUTS;
 
                 /* analog potentiometers */
@@ -704,26 +708,26 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                 input_set_abs_params(input, ABS_Z, 0, 0xf, 0, 1);
                 input_set_abs_params(input, ABS_MISC, 0, 0xf, 0, 1);
 
-                dev->ep4_in_urb = usb_alloc_urb(0, GFP_KERNEL);
-                if (!dev->ep4_in_urb) {
+                cdev->ep4_in_urb = usb_alloc_urb(0, GFP_KERNEL);
+                if (!cdev->ep4_in_urb) {
                         ret = -ENOMEM;
                         goto exit_free_idev;
                 }
 
-                usb_fill_bulk_urb(dev->ep4_in_urb, usb_dev,
+                usb_fill_bulk_urb(cdev->ep4_in_urb, usb_dev,
                                   usb_rcvbulkpipe(usb_dev, 0x4),
-                                  dev->ep4_in_buf, EP4_BUFSIZE,
-                                  snd_usb_caiaq_ep4_reply_dispatch, dev);
+                                  cdev->ep4_in_buf, EP4_BUFSIZE,
+                                  snd_usb_caiaq_ep4_reply_dispatch, cdev);
 
-                snd_usb_caiaq_set_auto_msg(dev, 1, 10, 5);
+                snd_usb_caiaq_set_auto_msg(cdev, 1, 10, 5);
 
                 break;
 
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLS4):
                 input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-                BUILD_BUG_ON(sizeof(dev->keycode) < KONTROLS4_BUTTONS);
+                BUILD_BUG_ON(sizeof(cdev->keycode) < KONTROLS4_BUTTONS);
                 for (i = 0; i < KONTROLS4_BUTTONS; i++)
-                        dev->keycode[i] = KONTROLS4_BUTTON(i);
+                        cdev->keycode[i] = KONTROLS4_BUTTON(i);
                 input->keycodemax = KONTROLS4_BUTTONS;
 
                 for (i = 0; i < KONTROLS4_AXIS; i++) {
@@ -743,18 +747,18 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                 for (i = 0; i < 9; i++)
                         input_set_abs_params(input, KONTROLS4_ABS(38+i), 0, 0xf, 0, 1);
 
-                dev->ep4_in_urb = usb_alloc_urb(0, GFP_KERNEL);
-                if (!dev->ep4_in_urb) {
+                cdev->ep4_in_urb = usb_alloc_urb(0, GFP_KERNEL);
+                if (!cdev->ep4_in_urb) {
                         ret = -ENOMEM;
                         goto exit_free_idev;
                 }
 
-                usb_fill_bulk_urb(dev->ep4_in_urb, usb_dev,
+                usb_fill_bulk_urb(cdev->ep4_in_urb, usb_dev,
                                   usb_rcvbulkpipe(usb_dev, 0x4),
-                                  dev->ep4_in_buf, EP4_BUFSIZE,
-                                  snd_usb_caiaq_ep4_reply_dispatch, dev);
+                                  cdev->ep4_in_buf, EP4_BUFSIZE,
+                                  snd_usb_caiaq_ep4_reply_dispatch, cdev);
 
-                snd_usb_caiaq_set_auto_msg(dev, 1, 10, 5);
+                snd_usb_caiaq_set_auto_msg(cdev, 1, 10, 5);
 
                 break;
 
@@ -767,8 +771,8 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                         BIT_MASK(ABS_RX) | BIT_MASK(ABS_RY) |
                         BIT_MASK(ABS_RZ);
 
-                BUILD_BUG_ON(sizeof(dev->keycode) < sizeof(keycode_maschine));
-                memcpy(dev->keycode, keycode_maschine, sizeof(keycode_maschine));
+                BUILD_BUG_ON(sizeof(cdev->keycode) < sizeof(keycode_maschine));
+                memcpy(cdev->keycode, keycode_maschine, sizeof(keycode_maschine));
                 input->keycodemax = ARRAY_SIZE(keycode_maschine);
 
                 for (i = 0; i < MASCHINE_PADS; i++) {
@@ -788,18 +792,18 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                 input_set_abs_params(input, ABS_RY, 0, 999, 0, 10);
                 input_set_abs_params(input, ABS_RZ, 0, 999, 0, 10);
 
-                dev->ep4_in_urb = usb_alloc_urb(0, GFP_KERNEL);
-                if (!dev->ep4_in_urb) {
+                cdev->ep4_in_urb = usb_alloc_urb(0, GFP_KERNEL);
+                if (!cdev->ep4_in_urb) {
                         ret = -ENOMEM;
                         goto exit_free_idev;
                 }
 
-                usb_fill_bulk_urb(dev->ep4_in_urb, usb_dev,
+                usb_fill_bulk_urb(cdev->ep4_in_urb, usb_dev,
                                   usb_rcvbulkpipe(usb_dev, 0x4),
-                                  dev->ep4_in_buf, EP4_BUFSIZE,
-                                  snd_usb_caiaq_ep4_reply_dispatch, dev);
+                                  cdev->ep4_in_buf, EP4_BUFSIZE,
+                                  snd_usb_caiaq_ep4_reply_dispatch, cdev);
 
-                snd_usb_caiaq_set_auto_msg(dev, 1, 10, 5);
+                snd_usb_caiaq_set_auto_msg(cdev, 1, 10, 5);
                 break;
 
         default:
@@ -809,12 +813,12 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
 
         input->open = snd_usb_caiaq_input_open;
         input->close = snd_usb_caiaq_input_close;
-        input->keycode = dev->keycode;
+        input->keycode = cdev->keycode;
         input->keycodesize = sizeof(unsigned short);
         for (i = 0; i < input->keycodemax; i++)
-                __set_bit(dev->keycode[i], input->keybit);
+                __set_bit(cdev->keycode[i], input->keybit);
 
-        dev->input_dev = input;
+        cdev->input_dev = input;
 
         ret = input_register_device(input);
         if (ret < 0)
@@ -824,19 +828,19 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
 
 exit_free_idev:
         input_free_device(input);
-        dev->input_dev = NULL;
+        cdev->input_dev = NULL;
         return ret;
 }
 
-void snd_usb_caiaq_input_free(struct snd_usb_caiaqdev *dev)
+void snd_usb_caiaq_input_free(struct snd_usb_caiaqdev *cdev)
 {
-        if (!dev || !dev->input_dev)
+        if (!cdev || !cdev->input_dev)
                 return;
 
-        usb_kill_urb(dev->ep4_in_urb);
-        usb_free_urb(dev->ep4_in_urb);
-        dev->ep4_in_urb = NULL;
+        usb_kill_urb(cdev->ep4_in_urb);
+        usb_free_urb(cdev->ep4_in_urb);
+        cdev->ep4_in_urb = NULL;
 
-        input_unregister_device(dev->input_dev);
-        dev->input_dev = NULL;
+        input_unregister_device(cdev->input_dev);
+        cdev->input_dev = NULL;
 }
diff --git a/sound/usb/caiaq/input.h b/sound/usb/caiaq/input.h
index ced535577864..6014e2713a60 100644
--- a/sound/usb/caiaq/input.h
+++ b/sound/usb/caiaq/input.h
@@ -1,8 +1,8 @@
 #ifndef CAIAQ_INPUT_H
 #define CAIAQ_INPUT_H
 
-void snd_usb_caiaq_input_dispatch(struct snd_usb_caiaqdev *dev, char *buf, unsigned int len);
-int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev);
-void snd_usb_caiaq_input_free(struct snd_usb_caiaqdev *dev);
+void snd_usb_caiaq_input_dispatch(struct snd_usb_caiaqdev *cdev, char *buf, unsigned int len);
+int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *cdev);
+void snd_usb_caiaq_input_free(struct snd_usb_caiaqdev *cdev);
 
 #endif
diff --git a/sound/usb/caiaq/midi.c b/sound/usb/caiaq/midi.c
index a1a47088fd0c..2d7588461b33 100644
--- a/sound/usb/caiaq/midi.c
+++ b/sound/usb/caiaq/midi.c
@@ -16,6 +16,7 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
 
+#include <linux/device.h>
 #include <linux/usb.h>
 #include <linux/gfp.h>
 #include <sound/rawmidi.h>
@@ -37,12 +38,12 @@ static int snd_usb_caiaq_midi_input_close(struct snd_rawmidi_substream *substrea
 
 static void snd_usb_caiaq_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
 {
-        struct snd_usb_caiaqdev *dev = substream->rmidi->private_data;
+        struct snd_usb_caiaqdev *cdev = substream->rmidi->private_data;
 
-        if (!dev)
+        if (!cdev)
                 return;
 
-        dev->midi_receive_substream = up ? substream : NULL;
+        cdev->midi_receive_substream = up ? substream : NULL;
 }
 
 
@@ -53,49 +54,50 @@ static int snd_usb_caiaq_midi_output_open(struct snd_rawmidi_substream *substrea
 
 static int snd_usb_caiaq_midi_output_close(struct snd_rawmidi_substream *substream)
 {
-        struct snd_usb_caiaqdev *dev = substream->rmidi->private_data;
-        if (dev->midi_out_active) {
-                usb_kill_urb(&dev->midi_out_urb);
-                dev->midi_out_active = 0;
+        struct snd_usb_caiaqdev *cdev = substream->rmidi->private_data;
+        if (cdev->midi_out_active) {
+                usb_kill_urb(&cdev->midi_out_urb);
+                cdev->midi_out_active = 0;
         }
         return 0;
 }
 
-static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *dev,
+static void snd_usb_caiaq_midi_send(struct snd_usb_caiaqdev *cdev,
                                     struct snd_rawmidi_substream *substream)
 {
         int len, ret;
+        struct device *dev = caiaqdev_to_dev(cdev);
 
-        dev->midi_out_buf[0] = EP1_CMD_MIDI_WRITE;
-        dev->midi_out_buf[1] = 0; /* port */
-        len = snd_rawmidi_transmit(substream, dev->midi_out_buf + 3,
+        cdev->midi_out_buf[0] = EP1_CMD_MIDI_WRITE;
+        cdev->midi_out_buf[1] = 0; /* port */
+        len = snd_rawmidi_transmit(substream, cdev->midi_out_buf + 3,
                                    EP1_BUFSIZE - 3);
 
         if (len <= 0)
                 return;
 
-        dev->midi_out_buf[2] = len;
-        dev->midi_out_urb.transfer_buffer_length = len+3;
+        cdev->midi_out_buf[2] = len;
+        cdev->midi_out_urb.transfer_buffer_length = len+3;
 
-        ret = usb_submit_urb(&dev->midi_out_urb, GFP_ATOMIC);
+        ret = usb_submit_urb(&cdev->midi_out_urb, GFP_ATOMIC);
         if (ret < 0)
-                log("snd_usb_caiaq_midi_send(%p): usb_submit_urb() failed,"
-                    "ret=%d, len=%d\n",
-                    substream, ret, len);
+                dev_err(dev,
+                        "snd_usb_caiaq_midi_send(%p): usb_submit_urb() failed,"
+                        "ret=%d, len=%d\n", substream, ret, len);
         else
-                dev->midi_out_active = 1;
+                cdev->midi_out_active = 1;
 }
 
 static void snd_usb_caiaq_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
 {
-        struct snd_usb_caiaqdev *dev = substream->rmidi->private_data;
+        struct snd_usb_caiaqdev *cdev = substream->rmidi->private_data;
 
         if (up) {
-                dev->midi_out_substream = substream;
-                if (!dev->midi_out_active)
-                        snd_usb_caiaq_midi_send(dev, substream);
+                cdev->midi_out_substream = substream;
+                if (!cdev->midi_out_active)
+                        snd_usb_caiaq_midi_send(cdev, substream);
         } else {
-                dev->midi_out_substream = NULL;
+                cdev->midi_out_substream = NULL;
         }
 }
 
@@ -114,13 +116,13 @@ static struct snd_rawmidi_ops snd_usb_caiaq_midi_input =
         .trigger =      snd_usb_caiaq_midi_input_trigger,
 };
 
-void snd_usb_caiaq_midi_handle_input(struct snd_usb_caiaqdev *dev,
+void snd_usb_caiaq_midi_handle_input(struct snd_usb_caiaqdev *cdev,
                                      int port, const char *buf, int len)
 {
-        if (!dev->midi_receive_substream)
+        if (!cdev->midi_receive_substream)
                 return;
 
-        snd_rawmidi_receive(dev->midi_receive_substream, buf, len);
+        snd_rawmidi_receive(cdev->midi_receive_substream, buf, len);
 }
 
 int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device)
@@ -160,15 +162,14 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device)
 
 void snd_usb_caiaq_midi_output_done(struct urb* urb)
 {
-        struct snd_usb_caiaqdev *dev = urb->context;
+        struct snd_usb_caiaqdev *cdev = urb->context;
 
-        dev->midi_out_active = 0;
+        cdev->midi_out_active = 0;
         if (urb->status != 0)
                 return;
 
-        if (!dev->midi_out_substream)
+        if (!cdev->midi_out_substream)
                 return;
 
-        snd_usb_caiaq_midi_send(dev, dev->midi_out_substream);
+        snd_usb_caiaq_midi_send(cdev, cdev->midi_out_substream);
 }
-
diff --git a/sound/usb/caiaq/midi.h b/sound/usb/caiaq/midi.h
index 380f984babc9..60bf3442b283 100644
--- a/sound/usb/caiaq/midi.h
+++ b/sound/usb/caiaq/midi.h
@@ -1,8 +1,9 @@
 #ifndef CAIAQ_MIDI_H
 #define CAIAQ_MIDI_H
 
-int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *dev);
-void snd_usb_caiaq_midi_handle_input(struct snd_usb_caiaqdev *dev, int port, const char *buf, int len);
+int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *cdev);
+void snd_usb_caiaq_midi_handle_input(struct snd_usb_caiaqdev *cdev,
+                                     int port, const char *buf, int len);
 void snd_usb_caiaq_midi_output_done(struct urb *urb);
 
 #endif /* CAIAQ_MIDI_H */
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 2da8ad75fd96..5254b18cedcd 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -82,6 +82,7 @@ static int pid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 };
 static int nrpacks = 8;         /* max. number of packets per urb */
 static int device_setup[SNDRV_CARDS]; /* device parameter for this card */
 static bool ignore_ctl_error;
+static bool autoclock = true;
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for the USB audio adapter.");
@@ -100,6 +101,8 @@ MODULE_PARM_DESC(device_setup, "Specific device setup (if needed).");
 module_param(ignore_ctl_error, bool, 0444);
 MODULE_PARM_DESC(ignore_ctl_error,
                  "Ignore errors from USB controller for mixer interfaces.");
+module_param(autoclock, bool, 0444);
+MODULE_PARM_DESC(autoclock, "Enable auto-clock selection for UAC2 devices (default: yes).");
 
 /*
  * we keep the snd_usb_audio_t instances by ourselves for merging
@@ -354,6 +357,7 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
         chip->card = card;
         chip->setup = device_setup[idx];
         chip->nrpacks = nrpacks;
+        chip->autoclock = autoclock;
         chip->probing = 1;
 
         chip->usb_id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
@@ -645,7 +649,6 @@ void snd_usb_autosuspend(struct snd_usb_audio *chip)
 static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
 {
         struct snd_usb_audio *chip = usb_get_intfdata(intf);
-        struct list_head *p;
         struct snd_usb_stream *as;
         struct usb_mixer_interface *mixer;
 
@@ -655,8 +658,7 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
         if (!PMSG_IS_AUTO(message)) {
                 snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
                 if (!chip->num_suspended_intf++) {
-                        list_for_each(p, &chip->pcm_list) {
-                                as = list_entry(p, struct snd_usb_stream, list);
+                        list_for_each_entry(as, &chip->pcm_list, list) {
                                 snd_pcm_suspend_all(as->pcm);
                                 as->substream[0].need_setup_ep =
                                         as->substream[1].need_setup_ep = true;
@@ -716,8 +718,7 @@ static struct usb_device_id usb_audio_ids [] = {
       .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL },
     { }                                         /* Terminating entry */
 };
-
-MODULE_DEVICE_TABLE (usb, usb_audio_ids);
+MODULE_DEVICE_TABLE(usb, usb_audio_ids);
 
 /*
  * entry point for linux usb interface
diff --git a/sound/usb/card.h b/sound/usb/card.h
index 8a751b4887ea..d32ea411545a 100644
--- a/sound/usb/card.h
+++ b/sound/usb/card.h
@@ -116,6 +116,7 @@ struct snd_usb_substream {
         unsigned int altset_idx;     /* USB data format: index of alternate setting */
         unsigned int txfr_quirk:1;      /* allow sub-frame alignment */
         unsigned int fmt_type;          /* USB audio format type (1-3) */
+        unsigned int pkt_offset_adj;    /* Bytes to drop from beginning of packets (for non-compliant devices) */
 
         unsigned int running: 1;        /* running status */
 
diff --git a/sound/usb/clock.c b/sound/usb/clock.c
index 9e2703a25156..b0ec3643eb62 100644
--- a/sound/usb/clock.c
+++ b/sound/usb/clock.c
@@ -32,6 +32,7 @@
 #include "card.h"
 #include "helper.h"
 #include "clock.h"
+#include "quirks.h"
 
 static struct uac_clock_source_descriptor *
         snd_usb_find_clock_source(struct usb_host_interface *ctrl_iface,
@@ -99,6 +100,41 @@ static int uac_clock_selector_get_val(struct snd_usb_audio *chip, int selector_i
         return buf;
 }
 
+static int uac_clock_selector_set_val(struct snd_usb_audio *chip, int selector_id,
+                                        unsigned char pin)
+{
+        int ret;
+
+        ret = snd_usb_ctl_msg(chip->dev, usb_sndctrlpipe(chip->dev, 0),
+                              UAC2_CS_CUR,
+                              USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT,
+                              UAC2_CX_CLOCK_SELECTOR << 8,
+                              snd_usb_ctrl_intf(chip) | (selector_id << 8),
+                              &pin, sizeof(pin));
+        if (ret < 0)
+                return ret;
+
+        if (ret != sizeof(pin)) {
+                snd_printk(KERN_ERR
+                        "usb-audio:%d: setting selector (id %d) unexpected length %d\n",
+                        chip->dev->devnum, selector_id, ret);
+                return -EINVAL;
+        }
+
+        ret = uac_clock_selector_get_val(chip, selector_id);
+        if (ret < 0)
+                return ret;
+
+        if (ret != pin) {
+                snd_printk(KERN_ERR
+                        "usb-audio:%d: setting selector (id %d) to %x failed (current: %d)\n",
+                        chip->dev->devnum, selector_id, pin, ret);
+                return -EINVAL;
+        }
+
+        return ret;
+}
+
 static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, int source_id)
 {
         int err;
@@ -131,7 +167,8 @@ static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, int source_id)
 }
 
 static int __uac_clock_find_source(struct snd_usb_audio *chip,
-                                   int entity_id, unsigned long *visited)
+                                   int entity_id, unsigned long *visited,
+                                   bool validate)
 {
         struct uac_clock_source_descriptor *source;
         struct uac_clock_selector_descriptor *selector;
@@ -148,12 +185,19 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip,
 
         /* first, see if the ID we're looking for is a clock source already */
         source = snd_usb_find_clock_source(chip->ctrl_intf, entity_id);
-        if (source)
-                return source->bClockID;
+        if (source) {
+                entity_id = source->bClockID;
+                if (validate && !uac_clock_source_is_valid(chip, entity_id)) {
+                        snd_printk(KERN_ERR "usb-audio:%d: clock source %d is not valid, cannot use\n",
+                                   chip->dev->devnum, entity_id);
+                        return -ENXIO;
+                }
+                return entity_id;
+        }
 
         selector = snd_usb_find_clock_selector(chip->ctrl_intf, entity_id);
         if (selector) {
-                int ret;
+                int ret, i, cur;
 
                 /* the entity ID we are looking for is a selector.
                  * find out what it currently selects */
@@ -164,22 +208,49 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip,
                 /* Selector values are one-based */
 
                 if (ret > selector->bNrInPins || ret < 1) {
-                        printk(KERN_ERR
+                        snd_printk(KERN_ERR
                                 "%s(): selector reported illegal value, id %d, ret %d\n",
                                 __func__, selector->bClockID, ret);
 
                         return -EINVAL;
                 }
 
-                return __uac_clock_find_source(chip, selector->baCSourceID[ret-1],
-                                               visited);
+                cur = ret;
+                ret = __uac_clock_find_source(chip, selector->baCSourceID[ret - 1],
+                                               visited, validate);
+                if (!validate || ret > 0 || !chip->autoclock)
+                        return ret;
+
+                /* The current clock source is invalid, try others. */
+                for (i = 1; i <= selector->bNrInPins; i++) {
+                        int err;
+
+                        if (i == cur)
+                                continue;
+
+                        ret = __uac_clock_find_source(chip, selector->baCSourceID[i - 1],
+                                visited, true);
+                        if (ret < 0)
+                                continue;
+
+                        err = uac_clock_selector_set_val(chip, entity_id, i);
+                        if (err < 0)
+                                continue;
+
+                        snd_printk(KERN_INFO
+                                "usb-audio:%d: found and selected valid clock source %d\n",
+                                chip->dev->devnum, ret);
+                        return ret;
+                }
+
+                return -ENXIO;
         }
 
         /* FIXME: multipliers only act as pass-thru element for now */
         multiplier = snd_usb_find_clock_multiplier(chip->ctrl_intf, entity_id);
         if (multiplier)
                 return __uac_clock_find_source(chip, multiplier->bCSourceID,
-                                                visited);
+                                                visited, validate);
 
         return -EINVAL;
 }
@@ -195,11 +266,12 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip,
  *
  * Returns the clock source UnitID (>=0) on success, or an error.
  */
-int snd_usb_clock_find_source(struct snd_usb_audio *chip, int entity_id)
+int snd_usb_clock_find_source(struct snd_usb_audio *chip, int entity_id,
+                              bool validate)
 {
         DECLARE_BITMAP(visited, 256);
         memset(visited, 0, sizeof(visited));
-        return __uac_clock_find_source(chip, entity_id, visited);
+        return __uac_clock_find_source(chip, entity_id, visited, validate);
 }
 
 static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface,
@@ -247,66 +319,71 @@ static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface,
         return 0;
 }
 
-static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface,
-                              struct usb_host_interface *alts,
-                              struct audioformat *fmt, int rate)
+static int get_sample_rate_v2(struct snd_usb_audio *chip, int iface,
+                              int altsetting, int clock)
 {
         struct usb_device *dev = chip->dev;
-        unsigned char data[4];
-        int err, cur_rate, prev_rate;
-        int clock = snd_usb_clock_find_source(chip, fmt->clock);
-
-        if (clock < 0)
-                return clock;
-
-        if (!uac_clock_source_is_valid(chip, clock)) {
-                /* TODO: should we try to find valid clock setups by ourself? */
-                snd_printk(KERN_ERR "%d:%d:%d: clock source %d is not valid, cannot use\n",
-                           dev->devnum, iface, fmt->altsetting, clock);
-                return -ENXIO;
-        }
+        __le32 data;
+        int err;
 
         err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,
                               USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
                               UAC2_CS_CONTROL_SAM_FREQ << 8,
                               snd_usb_ctrl_intf(chip) | (clock << 8),
-                              data, sizeof(data));
+                              &data, sizeof(data));
         if (err < 0) {
-                snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n",
-                           dev->devnum, iface, fmt->altsetting);
-                prev_rate = 0;
-        } else {
-                prev_rate = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+                snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2): err %d\n",
+                           dev->devnum, iface, altsetting, err);
+                return 0;
         }
 
-        data[0] = rate;
-        data[1] = rate >> 8;
-        data[2] = rate >> 16;
-        data[3] = rate >> 24;
-        if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR,
-                                   USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,
-                                   UAC2_CS_CONTROL_SAM_FREQ << 8,
-                                   snd_usb_ctrl_intf(chip) | (clock << 8),
-                                   data, sizeof(data))) < 0) {
-                snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d (v2)\n",
-                           dev->devnum, iface, fmt->altsetting, rate);
-                return err;
-        }
+        return le32_to_cpu(data);
+}
 
-        err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,
-                              USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-                              UAC2_CS_CONTROL_SAM_FREQ << 8,
-                              snd_usb_ctrl_intf(chip) | (clock << 8),
-                              data, sizeof(data));
-        if (err < 0) {
-                snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n",
-                           dev->devnum, iface, fmt->altsetting);
-                cur_rate = 0;
+static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface,
+                              struct usb_host_interface *alts,
+                              struct audioformat *fmt, int rate)
+{
+        struct usb_device *dev = chip->dev;
+        __le32 data;
+        int err, cur_rate, prev_rate;
+        int clock;
+        bool writeable;
+        struct uac_clock_source_descriptor *cs_desc;
+
+        clock = snd_usb_clock_find_source(chip, fmt->clock, true);
+        if (clock < 0)
+                return clock;
+
+        prev_rate = get_sample_rate_v2(chip, iface, fmt->altsetting, clock);
+
+        cs_desc = snd_usb_find_clock_source(chip->ctrl_intf, clock);
+        writeable = uac2_control_is_writeable(cs_desc->bmControls, UAC2_CS_CONTROL_SAM_FREQ - 1);
+        if (writeable) {
+                data = cpu_to_le32(rate);
+                err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR,
+                                      USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,
+                                      UAC2_CS_CONTROL_SAM_FREQ << 8,
+                                      snd_usb_ctrl_intf(chip) | (clock << 8),
+                                      &data, sizeof(data));
+                if (err < 0) {
+                        snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d (v2): err %d\n",
+                                   dev->devnum, iface, fmt->altsetting, rate, err);
+                        return err;
+                }
+
+                cur_rate = get_sample_rate_v2(chip, iface, fmt->altsetting, clock);
         } else {
-                cur_rate = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+                cur_rate = prev_rate;
         }
 
         if (cur_rate != rate) {
+                if (!writeable) {
+                        snd_printk(KERN_WARNING
+                                   "%d:%d:%d: freq mismatch (RO clock): req %d, clock runs @%d\n",
+                                   dev->devnum, iface, fmt->altsetting, rate, cur_rate);
+                        return -ENXIO;
+                }
                 snd_printd(KERN_WARNING
                            "current rate %d is different from the runtime rate %d\n",
                            cur_rate, rate);
@@ -316,7 +393,9 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface,
          * interface is active. */
         if (rate != prev_rate) {
                 usb_set_interface(dev, iface, 0);
+                snd_usb_set_interface_quirk(dev);
                 usb_set_interface(dev, iface, fmt->altsetting);
+                snd_usb_set_interface_quirk(dev);
         }
 
         return 0;
diff --git a/sound/usb/clock.h b/sound/usb/clock.h
index 46630936d31f..d592e4a29856 100644
--- a/sound/usb/clock.h
+++ b/sound/usb/clock.h
@@ -5,6 +5,7 @@ int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface,
                              struct usb_host_interface *alts,
                              struct audioformat *fmt, int rate);
 
-int snd_usb_clock_find_source(struct snd_usb_audio *chip, int entity_id);
+int snd_usb_clock_find_source(struct snd_usb_audio *chip, int entity_id,
+                             bool validate);
 
 #endif /* __USBAUDIO_CLOCK_H */
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 21049b882ee6..7e9c55a73540 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -128,7 +128,7 @@ static const char *usb_error_string(int err)
  * Determine whether an endpoint is driven by an implicit feedback
  * data endpoint source.
  */
-int snd_usb_endpoint_implict_feedback_sink(struct snd_usb_endpoint *ep)
+int snd_usb_endpoint_implicit_feedback_sink(struct snd_usb_endpoint *ep)
 {
         return  ep->sync_master &&
                 ep->sync_master->type == SND_USB_ENDPOINT_TYPE_DATA &&
@@ -363,7 +363,7 @@ static void snd_complete_urb(struct urb *urb)
                 if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags)))
                         goto exit_clear;
 
-                if (snd_usb_endpoint_implict_feedback_sink(ep)) {
+                if (snd_usb_endpoint_implicit_feedback_sink(ep)) {
                         unsigned long flags;
 
                         spin_lock_irqsave(&ep->lock, flags);
@@ -415,14 +415,12 @@ struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip,
                                               struct usb_host_interface *alts,
                                               int ep_num, int direction, int type)
 {
-        struct list_head *p;
         struct snd_usb_endpoint *ep;
         int is_playback = direction == SNDRV_PCM_STREAM_PLAYBACK;
 
         mutex_lock(&chip->mutex);
 
-        list_for_each(p, &chip->ep_list) {
-                ep = list_entry(p, struct snd_usb_endpoint, list);
+        list_for_each_entry(ep, &chip->ep_list, list) {
                 if (ep->ep_num == ep_num &&
                     ep->iface == alts->desc.bInterfaceNumber &&
                     ep->alt_idx == alts->desc.bAlternateSetting) {
@@ -607,7 +605,7 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep,
         else
                 packs_per_ms = 1;
 
-        if (is_playback && !snd_usb_endpoint_implict_feedback_sink(ep)) {
+        if (is_playback && !snd_usb_endpoint_implicit_feedback_sink(ep)) {
                 urb_packs = max(ep->chip->nrpacks, 1);
                 urb_packs = min(urb_packs, (unsigned int) MAX_PACKS);
         } else {
@@ -616,11 +614,11 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep,
 
         urb_packs *= packs_per_ms;
 
-        if (sync_ep && !snd_usb_endpoint_implict_feedback_sink(ep))
+        if (sync_ep && !snd_usb_endpoint_implicit_feedback_sink(ep))
                 urb_packs = min(urb_packs, 1U << sync_ep->syncinterval);
 
         /* decide how many packets to be used */
-        if (is_playback && !snd_usb_endpoint_implict_feedback_sink(ep)) {
+        if (is_playback && !snd_usb_endpoint_implicit_feedback_sink(ep)) {
                 unsigned int minsize, maxpacks;
                 /* determine how small a packet can be */
                 minsize = (ep->freqn >> (16 - ep->datainterval))
@@ -847,7 +845,7 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep)
 
         set_bit(EP_FLAG_RUNNING, &ep->flags);
 
-        if (snd_usb_endpoint_implict_feedback_sink(ep)) {
+        if (snd_usb_endpoint_implicit_feedback_sink(ep)) {
                 for (i = 0; i < ep->nurbs; i++) {
                         struct snd_urb_ctx *ctx = ep->urb + i;
                         list_add_tail(&ctx->ready_list, &ep->ready_playback_urbs);
@@ -990,7 +988,7 @@ void snd_usb_handle_sync_urb(struct snd_usb_endpoint *ep,
          * and add it to the list of pending urbs. queue_pending_output_urbs()
          * will take care of them later.
          */
-        if (snd_usb_endpoint_implict_feedback_sink(ep) &&
+        if (snd_usb_endpoint_implicit_feedback_sink(ep) &&
             ep->use_count != 0) {
 
                 /* implicit feedback case */
diff --git a/sound/usb/endpoint.h b/sound/usb/endpoint.h
index 447902dd8a4a..2287adf5ca59 100644
--- a/sound/usb/endpoint.h
+++ b/sound/usb/endpoint.h
@@ -23,7 +23,7 @@ int  snd_usb_endpoint_activate(struct snd_usb_endpoint *ep);
 int  snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep);
 void snd_usb_endpoint_free(struct list_head *head);
 
-int snd_usb_endpoint_implict_feedback_sink(struct snd_usb_endpoint *ep);
+int snd_usb_endpoint_implicit_feedback_sink(struct snd_usb_endpoint *ep);
 int snd_usb_endpoint_next_packet_size(struct snd_usb_endpoint *ep);
 
 void snd_usb_handle_sync_urb(struct snd_usb_endpoint *ep,
diff --git a/sound/usb/format.c b/sound/usb/format.c
index e831ee4238bb..20c775170959 100644
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -43,11 +43,11 @@
  */
 static u64 parse_audio_format_i_type(struct snd_usb_audio *chip,
                                      struct audioformat *fp,
-                                     int format, void *_fmt,
+                                     unsigned int format, void *_fmt,
                                      int protocol)
 {
         int sample_width, sample_bytes;
-        u64 pcm_formats;
+        u64 pcm_formats = 0;
 
         switch (protocol) {
         case UAC_VERSION_1:
@@ -63,14 +63,17 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip,
                 struct uac_format_type_i_ext_descriptor *fmt = _fmt;
                 sample_width = fmt->bBitResolution;
                 sample_bytes = fmt->bSubslotSize;
+
+                if (format & UAC2_FORMAT_TYPE_I_RAW_DATA)
+                        pcm_formats |= SNDRV_PCM_FMTBIT_SPECIAL;
+
                 format <<= 1;
                 break;
         }
         }
 
-        pcm_formats = 0;
-
-        if (format == 0 || format == (1 << UAC_FORMAT_TYPE_I_UNDEFINED)) {
+        if ((pcm_formats == 0) &&
+            (format == 0 || format == (1 << UAC_FORMAT_TYPE_I_UNDEFINED))) {
                 /* some devices don't define this correctly... */
                 snd_printdd(KERN_INFO "%d:%u:%d : format type 0 is detected, processed as PCM\n",
                             chip->dev->devnum, fp->iface, fp->altsetting);
@@ -277,7 +280,7 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip,
         struct usb_device *dev = chip->dev;
         unsigned char tmp[2], *data;
         int nr_triplets, data_size, ret = 0;
-        int clock = snd_usb_clock_find_source(chip, fp->clock);
+        int clock = snd_usb_clock_find_source(chip, fp->clock, false);
 
         if (clock < 0) {
                 snd_printk(KERN_ERR "%s(): unable to find clock source (clock %d)\n",
@@ -353,7 +356,7 @@ err:
  * parse the format type I and III descriptors
  */
 static int parse_audio_format_i(struct snd_usb_audio *chip,
-                                struct audioformat *fp, int format,
+                                struct audioformat *fp, unsigned int format,
                                 struct uac_format_type_i_continuous_descriptor *fmt,
                                 struct usb_host_interface *iface)
 {
@@ -473,8 +476,9 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip,
         return ret;
 }
 
-int snd_usb_parse_audio_format(struct snd_usb_audio *chip, struct audioformat *fp,
-                               int format, struct uac_format_type_i_continuous_descriptor *fmt,
+int snd_usb_parse_audio_format(struct snd_usb_audio *chip,
+                               struct audioformat *fp, unsigned int format,
+                               struct uac_format_type_i_continuous_descriptor *fmt,
                                int stream, struct usb_host_interface *iface)
 {
         int err;
diff --git a/sound/usb/format.h b/sound/usb/format.h
index 387924f0af85..6f315226f320 100644
--- a/sound/usb/format.h
+++ b/sound/usb/format.h
@@ -2,7 +2,7 @@
 #define __USBAUDIO_FORMAT_H
 
 int snd_usb_parse_audio_format(struct snd_usb_audio *chip,
-                               struct audioformat *fp, int format,
+                               struct audioformat *fp, unsigned int format,
                                struct uac_format_type_i_continuous_descriptor *fmt,
                                int stream, struct usb_host_interface *iface);
 
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 34b9bb7fe87c..8e01fa4991c5 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -126,7 +126,6 @@ struct snd_usb_midi {
                 struct snd_usb_midi_in_endpoint *in;
         } endpoints[MIDI_MAX_ENDPOINTS];
         unsigned long input_triggered;
-        bool autopm_reference;
         unsigned int opened[2];
         unsigned char disconnected;
         unsigned char input_running;
@@ -1040,7 +1039,6 @@ static int substream_open(struct snd_rawmidi_substream *substream, int dir,
 {
         struct snd_usb_midi* umidi = substream->rmidi->private_data;
         struct snd_kcontrol *ctl;
-        int err;
 
         down_read(&umidi->disc_rwsem);
         if (umidi->disconnected) {
@@ -1051,13 +1049,6 @@ static int substream_open(struct snd_rawmidi_substream *substream, int dir,
         mutex_lock(&umidi->mutex);
         if (open) {
                 if (!umidi->opened[0] && !umidi->opened[1]) {
-                        err = usb_autopm_get_interface(umidi->iface);
-                        umidi->autopm_reference = err >= 0;
-                        if (err < 0 && err != -EACCES) {
-                                mutex_unlock(&umidi->mutex);
-                                up_read(&umidi->disc_rwsem);
-                                return -EIO;
-                        }
                         if (umidi->roland_load_ctl) {
                                 ctl = umidi->roland_load_ctl;
                                 ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
@@ -1080,8 +1071,6 @@ static int substream_open(struct snd_rawmidi_substream *substream, int dir,
                                 snd_ctl_notify(umidi->card,
                                        SNDRV_CTL_EVENT_MASK_INFO, &ctl->id);
                         }
-                        if (umidi->autopm_reference)
-                                usb_autopm_put_interface(umidi->iface);
                 }
         }
         mutex_unlock(&umidi->mutex);
@@ -1455,6 +1444,7 @@ void snd_usbmidi_disconnect(struct list_head* p)
         }
         del_timer_sync(&umidi->error_timer);
 }
+EXPORT_SYMBOL(snd_usbmidi_disconnect);
 
 static void snd_usbmidi_rawmidi_free(struct snd_rawmidi *rmidi)
 {
@@ -1465,10 +1455,9 @@ static void snd_usbmidi_rawmidi_free(struct snd_rawmidi *rmidi)
 static struct snd_rawmidi_substream *snd_usbmidi_find_substream(struct snd_usb_midi* umidi,
                                                                 int stream, int number)
 {
-        struct list_head* list;
+        struct snd_rawmidi_substream *substream;
 
-        list_for_each(list, &umidi->rmidi->streams[stream].substreams) {
-                struct snd_rawmidi_substream *substream = list_entry(list, struct snd_rawmidi_substream, list);
+        list_for_each_entry(substream, &umidi->rmidi->streams[stream].substreams, list) {
                 if (substream->number == number)
                         return substream;
         }
@@ -2091,6 +2080,7 @@ void snd_usbmidi_input_stop(struct list_head* p)
         }
         umidi->input_running = 0;
 }
+EXPORT_SYMBOL(snd_usbmidi_input_stop);
 
 static void snd_usbmidi_input_start_ep(struct snd_usb_midi_in_endpoint* ep)
 {
@@ -2120,6 +2110,7 @@ void snd_usbmidi_input_start(struct list_head* p)
                 snd_usbmidi_input_start_ep(umidi->endpoints[i].in);
         umidi->input_running = 1;
 }
+EXPORT_SYMBOL(snd_usbmidi_input_start);
 
 /*
  * Creates and registers everything needed for a MIDI streaming interface.
@@ -2256,11 +2247,9 @@ int snd_usbmidi_create(struct snd_card *card,
                 return err;
         }
 
+        usb_autopm_get_interface_no_resume(umidi->iface);
+
         list_add_tail(&umidi->list, midi_list);
         return 0;
 }
-
 EXPORT_SYMBOL(snd_usbmidi_create);
-EXPORT_SYMBOL(snd_usbmidi_input_stop);
-EXPORT_SYMBOL(snd_usbmidi_input_start);
-EXPORT_SYMBOL(snd_usbmidi_disconnect);
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index f94397b42aa5..9916c85d8cdb 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -94,13 +94,11 @@ static snd_pcm_uframes_t snd_usb_pcm_pointer(struct snd_pcm_substream *substream
  */
 static struct audioformat *find_format(struct snd_usb_substream *subs)
 {
-        struct list_head *p;
+        struct audioformat *fp;
         struct audioformat *found = NULL;
         int cur_attr = 0, attr;
 
-        list_for_each(p, &subs->fmt_list) {
-                struct audioformat *fp;
-                fp = list_entry(p, struct audioformat, list);
+        list_for_each_entry(fp, &subs->fmt_list, list) {
                 if (!(fp->formats & (1uLL << subs->pcm_format)))
                         continue;
                 if (fp->channels != subs->channels)
@@ -350,6 +348,8 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
                                 fmt->iface, fmt->altsetting);
                 subs->interface = fmt->iface;
                 subs->altset_idx = fmt->altset_idx;
+
+                snd_usb_set_interface_quirk(dev);
         }
 
         subs->data_endpoint = snd_usb_add_endpoint(subs->stream->chip,
@@ -802,7 +802,7 @@ static int hw_rule_rate(struct snd_pcm_hw_params *params,
                         struct snd_pcm_hw_rule *rule)
 {
         struct snd_usb_substream *subs = rule->private;
-        struct list_head *p;
+        struct audioformat *fp;
         struct snd_interval *it = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
         unsigned int rmin, rmax;
         int changed;
@@ -810,9 +810,7 @@ static int hw_rule_rate(struct snd_pcm_hw_params *params,
         hwc_debug("hw_rule_rate: (%d,%d)\n", it->min, it->max);
         changed = 0;
         rmin = rmax = 0;
-        list_for_each(p, &subs->fmt_list) {
-                struct audioformat *fp;
-                fp = list_entry(p, struct audioformat, list);
+        list_for_each_entry(fp, &subs->fmt_list, list) {
                 if (!hw_check_valid_format(subs, params, fp))
                         continue;
                 if (changed++) {
@@ -856,7 +854,7 @@ static int hw_rule_channels(struct snd_pcm_hw_params *params,
                             struct snd_pcm_hw_rule *rule)
 {
         struct snd_usb_substream *subs = rule->private;
-        struct list_head *p;
+        struct audioformat *fp;
         struct snd_interval *it = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
         unsigned int rmin, rmax;
         int changed;
@@ -864,9 +862,7 @@ static int hw_rule_channels(struct snd_pcm_hw_params *params,
         hwc_debug("hw_rule_channels: (%d,%d)\n", it->min, it->max);
         changed = 0;
         rmin = rmax = 0;
-        list_for_each(p, &subs->fmt_list) {
-                struct audioformat *fp;
-                fp = list_entry(p, struct audioformat, list);
+        list_for_each_entry(fp, &subs->fmt_list, list) {
                 if (!hw_check_valid_format(subs, params, fp))
                         continue;
                 if (changed++) {
@@ -909,7 +905,7 @@ static int hw_rule_format(struct snd_pcm_hw_params *params,
                           struct snd_pcm_hw_rule *rule)
 {
         struct snd_usb_substream *subs = rule->private;
-        struct list_head *p;
+        struct audioformat *fp;
         struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
         u64 fbits;
         u32 oldbits[2];
@@ -917,9 +913,7 @@ static int hw_rule_format(struct snd_pcm_hw_params *params,
 
         hwc_debug("hw_rule_format: %x:%x\n", fmt->bits[0], fmt->bits[1]);
         fbits = 0;
-        list_for_each(p, &subs->fmt_list) {
-                struct audioformat *fp;
-                fp = list_entry(p, struct audioformat, list);
+        list_for_each_entry(fp, &subs->fmt_list, list) {
                 if (!hw_check_valid_format(subs, params, fp))
                         continue;
                 fbits |= fp->formats;
@@ -1027,7 +1021,7 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime,
 
 static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substream *subs)
 {
-        struct list_head *p;
+        struct audioformat *fp;
         unsigned int pt, ptmin;
         int param_period_time_if_needed;
         int err;
@@ -1041,9 +1035,7 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre
         runtime->hw.rates = 0;
         ptmin = UINT_MAX;
         /* check min/max rates and channels */
-        list_for_each(p, &subs->fmt_list) {
-                struct audioformat *fp;
-                fp = list_entry(p, struct audioformat, list);
+        list_for_each_entry(fp, &subs->fmt_list, list) {
                 runtime->hw.rates |= fp->rates;
                 if (runtime->hw.rate_min > fp->rate_min)
                         runtime->hw.rate_min = fp->rate_min;
@@ -1170,7 +1162,7 @@ static void retire_capture_urb(struct snd_usb_substream *subs,
         stride = runtime->frame_bits >> 3;
 
         for (i = 0; i < urb->number_of_packets; i++) {
-                cp = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset;
+                cp = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset + subs->pkt_offset_adj;
                 if (urb->iso_frame_desc[i].status && printk_ratelimit()) {
                         snd_printdd(KERN_ERR "frame %d active: %d\n", i, urb->iso_frame_desc[i].status);
                         // continue;
@@ -1274,7 +1266,7 @@ static void prepare_playback_urb(struct snd_usb_substream *subs,
                         }
                 }
                 if (period_elapsed &&
-                    !snd_usb_endpoint_implict_feedback_sink(subs->data_endpoint)) /* finish at the period boundary */
+                    !snd_usb_endpoint_implicit_feedback_sink(subs->data_endpoint)) /* finish at the period boundary */
                         break;
         }
         bytes = frames * stride;
diff --git a/sound/usb/proc.c b/sound/usb/proc.c
index d218f763501f..0182ef634d8b 100644
--- a/sound/usb/proc.c
+++ b/sound/usb/proc.c
@@ -73,15 +73,14 @@ void snd_usb_audio_create_proc(struct snd_usb_audio *chip)
  */
 static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct snd_info_buffer *buffer)
 {
-        struct list_head *p;
+        struct audioformat *fp;
         static char *sync_types[4] = {
                 "NONE", "ASYNC", "ADAPTIVE", "SYNC"
         };
 
-        list_for_each(p, &subs->fmt_list) {
-                struct audioformat *fp;
+        list_for_each_entry(fp, &subs->fmt_list, list) {
                 snd_pcm_format_t fmt;
-                fp = list_entry(p, struct audioformat, list);
+
                 snd_iprintf(buffer, "  Interface %d\n", fp->iface);
                 snd_iprintf(buffer, "    Altset %d\n", fp->altsetting);
                 snd_iprintf(buffer, "    Format:");
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index c39f898b15d2..86e4b8c17dad 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2748,6 +2748,46 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 {
+        USB_DEVICE(0x1235, 0x0018),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "Novation",
+                .product_name = "Twitch",
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const struct snd_usb_audio_quirk[]) {
+                        {
+                                .ifnum = 0,
+                                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
+                                .data = & (const struct audioformat) {
+                                        .formats = SNDRV_PCM_FMTBIT_S24_3LE,
+                                        .channels = 4,
+                                        .iface = 0,
+                                        .altsetting = 1,
+                                        .altset_idx = 1,
+                                        .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
+                                        .endpoint = 0x01,
+                                        .ep_attr = USB_ENDPOINT_XFER_ISOC,
+                                        .rates = SNDRV_PCM_RATE_44100 |
+                                                 SNDRV_PCM_RATE_48000,
+                                        .rate_min = 44100,
+                                        .rate_max = 48000,
+                                        .nr_rates = 2,
+                                        .rate_table = (unsigned int[]) {
+                                                44100, 48000
+                                        }
+                                }
+                        },
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_MIDI_RAW_BYTES
+                        },
+                        {
+                                .ifnum = -1
+                        }
+                }
+        }
+},
+{
         USB_DEVICE_VENDOR_SPEC(0x1235, 0x4661),
         .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                 .vendor_name = "Novation",
@@ -2996,7 +3036,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                                         .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
                                         .endpoint = 0x02,
                                         .ep_attr = 0x01,
-                                        .maxpacksize = 0x130,
                                         .rates = SNDRV_PCM_RATE_44100 |
                                                  SNDRV_PCM_RATE_48000,
                                         .rate_min = 44100,
@@ -3044,7 +3083,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                                         .attributes = 0x00,
                                         .endpoint = 0x03,
                                         .ep_attr = USB_ENDPOINT_SYNC_ASYNC,
-                                        .maxpacksize = 0x128,
                                         .rates = SNDRV_PCM_RATE_48000,
                                         .rate_min = 48000,
                                         .rate_max = 48000,
@@ -3070,7 +3108,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                                         .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
                                         .endpoint = 0x85,
                                         .ep_attr = USB_ENDPOINT_SYNC_SYNC,
-                                        .maxpacksize = 0x128,
                                         .rates = SNDRV_PCM_RATE_48000,
                                         .rate_min = 48000,
                                         .rate_max = 48000,
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 5325a3869bb7..175fbb7d334a 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -165,8 +165,10 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
                 return -EINVAL;
         }
         alts = &iface->altsetting[fp->altset_idx];
-        fp->datainterval = snd_usb_parse_datainterval(chip, alts);
-        fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
+        if (fp->datainterval == 0)
+                fp->datainterval = snd_usb_parse_datainterval(chip, alts);
+        if (fp->maxpacksize == 0)
+                fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
         usb_set_interface(chip->dev, fp->iface, 0);
         snd_usb_init_pitch(chip, fp->iface, alts, fp);
         snd_usb_init_sample_rate(chip, fp->iface, alts, fp, fp->rate_max);
@@ -446,6 +448,17 @@ static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
 }
 
 /*
+ * Novation Twitch DJ controller
+ */
+static int snd_usb_twitch_boot_quirk(struct usb_device *dev)
+{
+        /* preemptively set up the device because otherwise the
+         * raw MIDI endpoints are not active */
+        usb_set_interface(dev, 0, 1);
+        return 0;
+}
+
+/*
  * This call will put the synth in "USB send" mode, i.e it will send MIDI
  * messages through USB (this is disabled at startup). The synth will
  * acknowledge by sending a sysex on endpoint 0x85 and by displaying a USB
@@ -746,6 +759,10 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
                 /* Digidesign Mbox 2 */
                 return snd_usb_mbox2_boot_quirk(dev);
 
+        case USB_ID(0x1235, 0x0018):
+                /* Focusrite Novation Twitch */
+                return snd_usb_twitch_boot_quirk(dev);
+
         case USB_ID(0x133e, 0x0815):
                 /* Access Music VirusTI Desktop */
                 return snd_usb_accessmusic_boot_quirk(dev);
@@ -837,6 +854,7 @@ static void set_format_emu_quirk(struct snd_usb_substream *subs,
                 break;
         }
         snd_emuusb_set_samplerate(subs->stream->chip, emu_samplerate_id);
+        subs->pkt_offset_adj = (emu_samplerate_id >= EMU_QUIRK_SR_176400HZ) ? 4 : 0;
 }
 
 void snd_usb_set_format_quirk(struct snd_usb_substream *subs,
@@ -875,6 +893,16 @@ void snd_usb_endpoint_start_quirk(struct snd_usb_endpoint *ep)
                 ep->skip_packets = 16;
 }
 
+void snd_usb_set_interface_quirk(struct usb_device *dev)
+{
+        /*
+         * "Playback Design" products need a 50ms delay after setting the
+         * USB interface.
+         */
+        if (le16_to_cpu(dev->descriptor.idVendor) == 0x23ba)
+                mdelay(50);
+}
+
 void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe,
                            __u8 request, __u8 requesttype, __u16 value,
                            __u16 index, void *data, __u16 size)
diff --git a/sound/usb/quirks.h b/sound/usb/quirks.h
index 0ca9e91067a6..7c3681fd1c3c 100644
--- a/sound/usb/quirks.h
+++ b/sound/usb/quirks.h
@@ -26,6 +26,7 @@ int snd_usb_is_big_endian_format(struct snd_usb_audio *chip,
 
 void snd_usb_endpoint_start_quirk(struct snd_usb_endpoint *ep);
 
+void snd_usb_set_interface_quirk(struct usb_device *dev);
 void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe,
                            __u8 request, __u8 requesttype, __u16 value,
                            __u16 index, void *data, __u16 size);
diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index ad181d538bd9..8951f77a7201 100644
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -42,12 +42,11 @@
  */
 static void free_substream(struct snd_usb_substream *subs)
 {
-        struct list_head *p, *n;
+        struct audioformat *fp, *n;
 
         if (!subs->num_formats)
                 return; /* not initialized */
-        list_for_each_safe(p, n, &subs->fmt_list) {
-                struct audioformat *fp = list_entry(p, struct audioformat, list);
+        list_for_each_entry_safe(fp, n, &subs->fmt_list, list) {
                 kfree(fp->rate_table);
                 kfree(fp->chmap);
                 kfree(fp);
@@ -94,6 +93,7 @@ static void snd_usb_init_substream(struct snd_usb_stream *as,
         subs->dev = as->chip->dev;
         subs->txfr_quirk = as->chip->txfr_quirk;
         subs->speed = snd_usb_get_speed(subs->dev);
+        subs->pkt_offset_adj = 0;
 
         snd_usb_set_pcm_ops(as->pcm, stream);
 
@@ -313,14 +313,12 @@ int snd_usb_add_audio_stream(struct snd_usb_audio *chip,
                              int stream,
                              struct audioformat *fp)
 {
-        struct list_head *p;
         struct snd_usb_stream *as;
         struct snd_usb_substream *subs;
         struct snd_pcm *pcm;
         int err;
 
-        list_for_each(p, &chip->pcm_list) {
-                as = list_entry(p, struct snd_usb_stream, list);
+        list_for_each_entry(as, &chip->pcm_list, list) {
                 if (as->fmt_type != fp->fmt_type)
                         continue;
                 subs = &as->substream[stream];
@@ -332,8 +330,7 @@ int snd_usb_add_audio_stream(struct snd_usb_audio *chip,
                 }
         }
         /* look for an empty stream */
-        list_for_each(p, &chip->pcm_list) {
-                as = list_entry(p, struct snd_usb_stream, list);
+        list_for_each_entry(as, &chip->pcm_list, list) {
                 if (as->fmt_type != fp->fmt_type)
                         continue;
                 subs = &as->substream[stream];
@@ -463,7 +460,7 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
         struct usb_host_interface *alts;
         struct usb_interface_descriptor *altsd;
         int i, altno, err, stream;
-        int format = 0, num_channels = 0;
+        unsigned int format = 0, num_channels = 0;
         struct audioformat *fp = NULL;
         int num, protocol, clock = 0;
         struct uac_format_type_i_continuous_descriptor *fmt;
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index 1ac3fd9cc5a6..bc43bcaddf4d 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -56,6 +56,7 @@ struct snd_usb_audio {
 
         int setup;                      /* from the 'device_setup' module param */
         int nrpacks;                    /* from the 'nrpacks' module param */
+        bool autoclock;                 /* from the 'autoclock' module param */
 
         struct usb_host_interface *ctrl_intf;   /* the audio control interface */
 };