Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "This contains pretty many small commits covering fairly large range of
  files in sound/ directory.  Partly because of additional API support
  and partly because of constantly developed ASoC and ARM stuff.

  Some highlights:

   - Introduced the helper function and documentation for exposing the
     channel map via control API, as discussed in Plumbers; most of PCI
     drivers are covered, will follow more drivers later

   - Most of drivers have been replaced with the new PM callbacks (if
     the bus is supported)

   - HD-audio controller got the support of runtime PM and the support
     of D3 clock-stop.  Also changing the power_save option in sysfs
     kicks off immediately to enable / disable the power-save mode.

   - Another significant code change in HD-audio is the rewrite of
     firmware loading code.  Other than that, most of changes in
     HD-audio are continued cleanups and standardization for the generic
     auto parser and bug fixes (HBR, device-specific fixups), in
     addition to the support of channel-map API.

   - Addition of ASoC bindings for the compressed API, used by the
     mid-x86 drivers.

   - Lots of cleanups and API refreshes for ASoC codec drivers and
     DaVinci.

   - Conversion of OMAP to dmaengine.

   - New machine driver for Wolfson Microelectronics Bells.

   - New CODEC driver for Wolfson Microelectronics WM0010.

   - Enhancements to the ux500 and wm2000 drivers

   - A new driver for DA9055 and the support for regulator bypass mode."

Fix up various arm soc header file reorg conflicts.

* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits)
  ALSA: hda - Add new codec ALC283 ALC290 support
  ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls
  ALSA: hda - fix indices on boost volume on Conexant
  ALSA: aloop - add locking to timer access
  ALSA: hda - Fix hang caused by race during suspend.
  sound: Remove unnecessary semicolon
  ALSA: hda/realtek - Fix detection of ALC271X codec
  ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
  ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event
  ALSA: hda - make a generic unsol event handler
  ASoC: codecs: Add DA9055 codec driver
  ASoC: eukrea-tlv320: Convert it to platform driver
  ALSA: ASoC: add DT bindings for CS4271
  ASoC: wm_hubs: Ensure volume updates are handled during class W startup
  ASoC: wm5110: Adding missing volume update bits
  ASoC: wm5110: Add OUT3R support
  ASoC: wm5110: Add AEC loopback support
  ASoC: wm5110: Rename EPOUT to HPOUT3
  ASoC: arizona: Add more clock rates
  ASoC: arizona: Add more DSP options for mixer input muxes
  ...

7 files changed, 19 insertions, 19 deletions

diff --git a/sound/oss/audio.c b/sound/oss/audio.c
index 4b958b1c497c..09c932f899b8 100644
--- a/sound/oss/audio.c
+++ b/sound/oss/audio.c
@@ -354,7 +354,7 @@ int audio_read(int dev, struct file *file, char __user *buf, int count)
 
                         if(copy_to_user(&(buf)[p], fixit, l))
                                 return -EFAULT;
-                };
+                }
 
                 DMAbuf_rmchars(dev, buf_no, l);
 
diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c
index 407cd677950b..c5c24409ceb0 100644
--- a/sound/oss/opl3.c
+++ b/sound/oss/opl3.c
@@ -1190,7 +1190,7 @@ static int opl3_init(int ioaddr, struct module *owner)
 
                 for (i = 0; i < 18; i++)
                         pv_map[i].ioaddr = devc->left_io;
-        };
+        }
         conf_printf2(devc->fm_info.name, ioaddr, 0, -1, -1);
 
         for (i = 0; i < SBFM_MAXINSTR; i++)
diff --git a/sound/oss/pss.c b/sound/oss/pss.c
index 0f32a561f15f..145e36b2cfd0 100644
--- a/sound/oss/pss.c
+++ b/sound/oss/pss.c
@@ -359,7 +359,7 @@ static int pss_download_boot(pss_confdata * devc, unsigned char *block, int size
                 {
                         /*_____ Send the next byte */
                         outw (*block++, REG (PSS_DATA));
-                };
+                }
                 count++;
         }
 
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index 5c773dff5ac5..c0be085e4a20 100644
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -1104,15 +1104,15 @@ int ess_init(sb_devc * devc, struct address_info *hw_config)
                 default:
                         printk (KERN_ERR "Invalid esstype=%d specified\n", devc->sbmo.esstype);
                         return 0;
-                };
+                }
                 if (submodel != -1) {
                         devc->submodel = submodel;
                         sprintf (modelname, "ES%d", devc->sbmo.esstype);
                         chip = modelname;
-                };
+                }
                 if (chip == NULL && (ess_minor & 0x0f) < 8) {
                         chip = "ES688";
-                };
+                }
 #ifdef FKS_TEST
 FKS_test (devc);
 #endif
@@ -1122,7 +1122,7 @@ FKS_test (devc);
                  */
                 if (chip == NULL && devc->sbmo.esstype == ESSTYPE_LIKE20) {
                         chip = "ES1688";
-                };
+                }
 
                 if (chip == NULL) {
                         int type;
@@ -1150,8 +1150,8 @@ FKS_test (devc);
                                 if ((type & 0x00ff) != ((type >> 8) & 0x00ff)) {
                                         printk ("ess_init: Unrecognized %04x\n", type);
                                 }
-                        };
-                };
+                        }
+                }
 #if 0
                 /*
                  * this one failed:
@@ -1182,10 +1182,10 @@ FKS_test (devc);
                                 chip = "ES1788";
                                 devc->submodel = SUBMDL_ES1788;
                         }
-                };
+                }
                 if (chip == NULL) {
                         chip = "ES1688";
-                };
+                }
 
             printk ( KERN_INFO "ESS chip %s %s%s\n"
                , chip
@@ -1293,7 +1293,7 @@ printk(KERN_INFO "ess_set_dma_hw: dma8=%d,dma16=%d,dup=%d\n"
                         default:
                                 printk(KERN_ERR "ESS1887: Invalid DMA16 %d\n", dma);
                                 return 0;
-                        };
+                        }
                         ess_chgmixer (devc, 0x78, 0x20, dma16_bits);
                         ess_chgmixer (devc, 0x7d, 0x07, dma_bits);
                 }
@@ -1584,7 +1584,7 @@ printk(KERN_INFO "FKS: write mixer %x: %x\n", port, value);
                 udelay(20);
                 outb(((unsigned char) (value & 0xff)), MIXER_DATA);
                 udelay(20);
-        };
+        }
         spin_unlock_irqrestore(&devc->lock, flags);
 }
 
@@ -1761,7 +1761,7 @@ int ess_mixer_reset (sb_devc * devc)
                         ess_chgmixer(devc, 0x7a, 0x18, 0x08);
                         ess_chgmixer(devc, 0x1c, 0x07, 0x07);
                         break;
-                };
+                }
                 /*
                  * Call set_recmask for proper initialization
                  */
diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c
index f8f3b7a66b73..acf7586aeb47 100644
--- a/sound/oss/sb_mixer.c
+++ b/sound/oss/sb_mixer.c
@@ -410,7 +410,7 @@ static int set_recmask(sb_devc * devc, int mask)
                 case MDL_SMW:
                         if (devc->model == MDL_ESS && ess_set_recmask (devc, &devmask)) {
                                 break;
-                        };
+                        }
                         if (devmask != SOUND_MASK_MIC &&
                                 devmask != SOUND_MASK_LINE &&
                                 devmask != SOUND_MASK_CD)
@@ -666,7 +666,7 @@ static void sb_mixer_reset(sb_devc * devc)
 
         if (devc->model != MDL_ESS || !ess_mixer_reset (devc)) {
                 set_recmask(devc, SOUND_MASK_MIC);
-        };
+        }
 }
 
 int sb_mixer_init(sb_devc * devc, struct module *owner)
diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c
index 8db6aefe15e4..9f039831114c 100644
--- a/sound/oss/sys_timer.c
+++ b/sound/oss/sys_timer.c
@@ -57,7 +57,7 @@ poll_def_tmr(unsigned long dummy)
                   {
                           def_tmr.expires = (1) + jiffies;
                           add_timer(&def_tmr);
-                  };
+                  }
 
                   if (tmr_running)
                     {
@@ -103,7 +103,7 @@ def_tmr_open(int dev, int mode)
         {
                 def_tmr.expires = (1) + jiffies;
                 add_timer(&def_tmr);
-        };
+        }
 
         return 0;
 }
diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c
index f3f914aa92ee..1079133dd6ab 100644
--- a/sound/oss/uart6850.c
+++ b/sound/oss/uart6850.c
@@ -146,7 +146,7 @@ static int uart6850_open(int dev, int mode,
         {
 /*                printk("Midi6850: Midi busy\n");*/
                   return -EBUSY;
-        };
+        }
 
         uart6850_cmd(UART_RESET);
         uart6850_input_loop();