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

Pull sound updates from Takashi Iwai:
 "This development cycle resulted in a fair amount of changes in both
  core and driver sides. The most significant change in ALSA core is
  about PCM. Also the support of of-graph card and the new DAPM widget
  for DSP are noteworthy changes in ASoC core. And there're lots of
  small changes splat over the tree, as you can see in diffstat.

  Below are a few highlights:

  ALSA core:
   - Removal of set_fs() hackery from PCM core stuff, and the code
     reorganization / optimization thereafter
   - Improved support of PCM ack ops, and a new ABI for improved
     control/status mmap handling
   - Lots of constifications in various codes

  ASoC core:
   - The support of of-graph card, which may work as a better generic
     device for a replacement of simple-card
   - New widget types intended mainly for use with DSPs

  ASoC drivers:
   - New drivers for Allwinner V3s SoCs
   - Ensonic ES8316 codec support
   - More Intel SKL and KBL works
   - More device support for Intel SST Atom (mostly for cheap tablets
     and 2-in-1 devices)
   - Support for Rockchip PDM controllers
   - Support for STM32 I2S and S/PDIF controllers
   - Support for ZTE AUD96P22 codecs

  HD-audio:
   - Support of new Realtek codecs (ALC215/ALC285/ALC289), more quirks
     for HP and Dell machines
   - A few more fixes for i915 component binding"

* tag 'sound-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (418 commits)
  ALSA: hda - Fix unbalance of i915 module refcount
  ASoC: Intel: Skylake: Remove driver debugfs exit
  ASoC: Intel: Skylake: explicitly add the headers sst-dsp.h
  ALSA: hda/realtek - Remove GPIO_MASK
  ALSA: hda/realtek - Fix typo of pincfg for Dell quirk
  ALSA: pcm: add a documentation for tracepoints
  ALSA: atmel: ac97c: fix error return code in atmel_ac97c_probe()
  ALSA: x86: fix error return code in hdmi_lpe_audio_probe()
  ASoC: Intel: Skylake: Add support to read firmware registers
  ASoC: Intel: Skylake: Add sram address to sst_addr structure
  ASoC: Intel: Skylake: Debugfs facility to dump module config
  ASoC: Intel: Skylake: Add debugfs support
  ASoC: fix semicolon.cocci warnings
  ASoC: rt5645: Add quirk override by module option
  ASoC: rsnd: make arrays path and cmd_case static const
  ASoC: audio-graph-card: add widgets and routing for external amplifier support
  ASoC: audio-graph-card: update bindings for amplifier support
  ASoC: rt5665: calibration should be done before jack detection
  ASoC: rsnd: constify dev_pm_ops structures.
  ASoC: nau8825: change crosstalk-bypass property to bool type
  ...

16 files changed, 211 insertions, 181 deletions

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 37adcc6cbe6b..cb54d9c0a77f 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -377,6 +377,7 @@ config SND_SBAWE
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_SB16_DSP
+        select SND_SEQ_DEVICE if SND_SEQUENCER != n
         help
           Say Y here to include support for Sound Blaster AWE soundcards
           (including the Plug and Play version).
@@ -384,6 +385,13 @@ config SND_SBAWE
           To compile this driver as a module, choose M here: the module
           will be called snd-sbawe.
 
+# select SEQ stuff to min(SND_SEQUENCER,SND_XXX)
+config SND_SBAWE_SEQ
+        def_tristate SND_SEQUENCER && SND_SBAWE
+        select SND_SEQ_MIDI_EMUL
+        select SND_SEQ_VIRMIDI
+        select SND_SYNTH_EMUX
+
 config SND_SB16_CSP
         bool "Sound Blaster 16/AWE CSP support"
         depends on (SND_SB16 || SND_SBAWE) && (BROKEN || !PPC)
diff --git a/sound/isa/cmi8328.c b/sound/isa/cmi8328.c
index 8e1756c3b9bb..d09e456107ad 100644
--- a/sound/isa/cmi8328.c
+++ b/sound/isa/cmi8328.c
@@ -26,7 +26,7 @@ MODULE_AUTHOR("Ondrej Zary <linux@rainbow-software.org>");
 MODULE_DESCRIPTION("C-Media CMI8328");
 MODULE_LICENSE("GPL");
 
-#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
+#if IS_ENABLED(CONFIG_GAMEPORT)
 #define SUPPORT_JOYSTICK 1
 #endif
 
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c
index 2b7cc596f4c6..2012936f6756 100644
--- a/sound/isa/cs423x/cs4236_lib.c
+++ b/sound/isa/cs423x/cs4236_lib.c
@@ -138,7 +138,7 @@ static unsigned char snd_cs4236_ctrl_in(struct snd_wss *chip, unsigned char reg)
 
 #define CLOCKS 8
 
-static struct snd_ratnum clocks[CLOCKS] = {
+static const struct snd_ratnum clocks[CLOCKS] = {
         { .num = 16934400, .den_min = 353, .den_max = 353, .den_step = 1 },
         { .num = 16934400, .den_min = 529, .den_max = 529, .den_step = 1 },
         { .num = 16934400, .den_min = 617, .den_max = 617, .den_step = 1 },
@@ -149,7 +149,7 @@ static struct snd_ratnum clocks[CLOCKS] = {
         { .num = 16934400/16, .den_min = 21, .den_max = 192, .den_step = 1 }
 };
 
-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks = {
+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks = {
         .nrats = CLOCKS,
         .rats = clocks,
 };
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 81cf26fa28d6..5d3df96c5e5b 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -290,7 +290,7 @@ static int snd_es1688_init(struct snd_es1688 * chip, int enable)
 
  */
 
-static struct snd_ratnum clocks[2] = {
+static const struct snd_ratnum clocks[2] = {
         {
                 .num = 795444,
                 .den_min = 1,
@@ -305,7 +305,7 @@ static struct snd_ratnum clocks[2] = {
         }
 };
 
-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {
+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {
         .nrats = 2,
         .rats = clocks,
 };
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 0cabe2b8974f..ae17a6584061 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -369,7 +369,7 @@ static int snd_es18xx_reset_fifo(struct snd_es18xx *chip)
         return 0;
 }
 
-static struct snd_ratnum new_clocks[2] = {
+static const struct snd_ratnum new_clocks[2] = {
         {
                 .num = 793800,
                 .den_min = 1,
@@ -384,12 +384,12 @@ static struct snd_ratnum new_clocks[2] = {
         }
 };
 
-static struct snd_pcm_hw_constraint_ratnums new_hw_constraints_clocks = {
+static const struct snd_pcm_hw_constraint_ratnums new_hw_constraints_clocks = {
         .nrats = 2,
         .rats = new_clocks,
 };
 
-static struct snd_ratnum old_clocks[2] = {
+static const struct snd_ratnum old_clocks[2] = {
         {
                 .num = 795444,
                 .den_min = 1,
@@ -404,7 +404,7 @@ static struct snd_ratnum old_clocks[2] = {
         }
 };
 
-static struct snd_pcm_hw_constraint_ratnums old_hw_constraints_clocks  = {
+static const struct snd_pcm_hw_constraint_ratnums old_hw_constraints_clocks  = {
         .nrats = 2,
         .rats = old_clocks,
 };
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 4490ee442ff4..3cf9b13c780a 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -82,7 +82,7 @@ static int snd_gus_joystick_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el
         return change;
 }
 
-static struct snd_kcontrol_new snd_gus_joystick_control = {
+static const struct snd_kcontrol_new snd_gus_joystick_control = {
         .iface = SNDRV_CTL_ELEM_IFACE_CARD,
         .name = "Joystick Speed",
         .info = snd_gus_joystick_info,
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index 06505999155f..6b3da01a93b7 100644
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -61,8 +61,6 @@ struct gus_pcm_private {
         int final_volume;
 };
 
-static int snd_gf1_pcm_use_dma = 1;
-
 static void snd_gf1_pcm_block_change_ack(struct snd_gus_card * gus, void *private_data)
 {
         struct gus_pcm_private *pcmp = private_data;
@@ -355,66 +353,83 @@ static int snd_gf1_pcm_poke_block(struct snd_gus_card *gus, unsigned char *buf,
         return 0;
 }
 
-static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream,
-                                     int voice,
-                                     snd_pcm_uframes_t pos,
-                                     void __user *src,
-                                     snd_pcm_uframes_t count)
+static int get_bpos(struct gus_pcm_private *pcmp, int voice, unsigned int pos,
+                    unsigned int len)
 {
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct gus_pcm_private *pcmp = runtime->private_data;
-        unsigned int bpos, len;
-        
-        bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
-        len = samples_to_bytes(runtime, count);
+        unsigned int bpos = pos + (voice * (pcmp->dma_size / 2));
         if (snd_BUG_ON(bpos > pcmp->dma_size))
                 return -EIO;
         if (snd_BUG_ON(bpos + len > pcmp->dma_size))
                 return -EIO;
+        return bpos;
+}
+
+static int playback_copy_ack(struct snd_pcm_substream *substream,
+                             unsigned int bpos, unsigned int len)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct gus_pcm_private *pcmp = runtime->private_data;
+        struct snd_gus_card *gus = pcmp->gus;
+        int w16, invert;
+
+        if (len > 32)
+                return snd_gf1_pcm_block_change(substream, bpos,
+                                                pcmp->memory + bpos, len);
+
+        w16 = (snd_pcm_format_width(runtime->format) == 16);
+        invert = snd_pcm_format_unsigned(runtime->format);
+        return snd_gf1_pcm_poke_block(gus, runtime->dma_area + bpos,
+                                      pcmp->memory + bpos, len, w16, invert);
+}
+
+static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream,
+                                     int voice, unsigned long pos,
+                                     void __user *src, unsigned long count)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct gus_pcm_private *pcmp = runtime->private_data;
+        unsigned int len = count;
+        int bpos;
+
+        bpos = get_bpos(pcmp, voice, pos, len);
+        if (bpos < 0)
+                return pos;
         if (copy_from_user(runtime->dma_area + bpos, src, len))
                 return -EFAULT;
-        if (snd_gf1_pcm_use_dma && len > 32) {
-                return snd_gf1_pcm_block_change(substream, bpos, pcmp->memory + bpos, len);
-        } else {
-                struct snd_gus_card *gus = pcmp->gus;
-                int err, w16, invert;
+        return playback_copy_ack(substream, bpos, len);
+}
 
-                w16 = (snd_pcm_format_width(runtime->format) == 16);
-                invert = snd_pcm_format_unsigned(runtime->format);
-                if ((err = snd_gf1_pcm_poke_block(gus, runtime->dma_area + bpos, pcmp->memory + bpos, len, w16, invert)) < 0)
-                        return err;
-        }
-        return 0;
+static int snd_gf1_pcm_playback_copy_kernel(struct snd_pcm_substream *substream,
+                                            int voice, unsigned long pos,
+                                            void *src, unsigned long count)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct gus_pcm_private *pcmp = runtime->private_data;
+        unsigned int len = count;
+        int bpos;
+
+        bpos = get_bpos(pcmp, voice, pos, len);
+        if (bpos < 0)
+                return pos;
+        memcpy(runtime->dma_area + bpos, src, len);
+        return playback_copy_ack(substream, bpos, len);
 }
 
 static int snd_gf1_pcm_playback_silence(struct snd_pcm_substream *substream,
-                                        int voice,
-                                        snd_pcm_uframes_t pos,
-                                        snd_pcm_uframes_t count)
+                                        int voice, unsigned long pos,
+                                        unsigned long count)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct gus_pcm_private *pcmp = runtime->private_data;
-        unsigned int bpos, len;
+        unsigned int len = count;
+        int bpos;
         
-        bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
-        len = samples_to_bytes(runtime, count);
-        if (snd_BUG_ON(bpos > pcmp->dma_size))
-                return -EIO;
-        if (snd_BUG_ON(bpos + len > pcmp->dma_size))
-                return -EIO;
-        snd_pcm_format_set_silence(runtime->format, runtime->dma_area + bpos, count);
-        if (snd_gf1_pcm_use_dma && len > 32) {
-                return snd_gf1_pcm_block_change(substream, bpos, pcmp->memory + bpos, len);
-        } else {
-                struct snd_gus_card *gus = pcmp->gus;
-                int err, w16, invert;
-
-                w16 = (snd_pcm_format_width(runtime->format) == 16);
-                invert = snd_pcm_format_unsigned(runtime->format);
-                if ((err = snd_gf1_pcm_poke_block(gus, runtime->dma_area + bpos, pcmp->memory + bpos, len, w16, invert)) < 0)
-                        return err;
-        }
-        return 0;
+        bpos = get_bpos(pcmp, voice, pos, len);
+        if (bpos < 0)
+                return pos;
+        snd_pcm_format_set_silence(runtime->format, runtime->dma_area + bpos,
+                                   bytes_to_samples(runtime, count));
+        return playback_copy_ack(substream, bpos, len);
 }
 
 static int snd_gf1_pcm_playback_hw_params(struct snd_pcm_substream *substream,
@@ -547,14 +562,14 @@ static snd_pcm_uframes_t snd_gf1_pcm_playback_pointer(struct snd_pcm_substream *
         return pos;
 }
 
-static struct snd_ratnum clock = {
+static const struct snd_ratnum clock = {
         .num = 9878400/16,
         .den_min = 2,
         .den_max = 257,
         .den_step = 1,
 };
 
-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {
+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {
         .nrats = 1,
         .rats = &clock,
 };
@@ -809,7 +824,7 @@ static int snd_gf1_pcm_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
         return change;
 }
 
-static struct snd_kcontrol_new snd_gf1_pcm_volume_control =
+static const struct snd_kcontrol_new snd_gf1_pcm_volume_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "PCM Playback Volume",
@@ -818,7 +833,7 @@ static struct snd_kcontrol_new snd_gf1_pcm_volume_control =
         .put = snd_gf1_pcm_volume_put
 };
 
-static struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =
+static const struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "GPCM Playback Volume",
@@ -836,8 +851,9 @@ static struct snd_pcm_ops snd_gf1_pcm_playback_ops = {
         .prepare =      snd_gf1_pcm_playback_prepare,
         .trigger =      snd_gf1_pcm_playback_trigger,
         .pointer =      snd_gf1_pcm_playback_pointer,
-        .copy =         snd_gf1_pcm_playback_copy,
-        .silence =      snd_gf1_pcm_playback_silence,
+        .copy_user =    snd_gf1_pcm_playback_copy,
+        .copy_kernel =  snd_gf1_pcm_playback_copy_kernel,
+        .fill_silence = snd_gf1_pcm_playback_silence,
 };
 
 static struct snd_pcm_ops snd_gf1_pcm_capture_ops = {
diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c
index ec180708f160..d56973b770c7 100644
--- a/sound/isa/sb/emu8000.c
+++ b/sound/isa/sb/emu8000.c
@@ -1138,7 +1138,7 @@ snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports,
                 snd_emu8000_free(hw);
                 return err;
         }
-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
+#if IS_ENABLED(CONFIG_SND_SEQUENCER)
         if (snd_seq_device_new(card, index, SNDRV_SEQ_DEV_ID_EMU8000,
                                sizeof(struct snd_emu8000*), &awe) >= 0) {
                 strcpy(awe->name, "EMU-8000");
diff --git a/sound/isa/sb/emu8000_callback.c b/sound/isa/sb/emu8000_callback.c
index 72a9ac5efb40..d28d712f99f4 100644
--- a/sound/isa/sb/emu8000_callback.c
+++ b/sound/isa/sb/emu8000_callback.c
@@ -36,7 +36,7 @@ static void reset_voice(struct snd_emux *emu, int ch);
 static void terminate_voice(struct snd_emux_voice *vp);
 static void sysex(struct snd_emux *emu, char *buf, int len, int parsed,
                   struct snd_midi_channel_set *chset);
-#ifdef CONFIG_SND_SEQUENCER_OSS
+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)
 static int oss_ioctl(struct snd_emux *emu, int cmd, int p1, int p2);
 #endif
 static int load_fx(struct snd_emux *emu, int type, int mode,
@@ -76,7 +76,7 @@ static struct snd_emux_operators emu8000_ops = {
         .sample_reset = snd_emu8000_sample_reset,
         .load_fx =      load_fx,
         .sysex =        sysex,
-#ifdef CONFIG_SND_SEQUENCER_OSS
+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)
         .oss_ioctl =    oss_ioctl,
 #endif
 };
@@ -477,7 +477,7 @@ sysex(struct snd_emux *emu, char *buf, int len, int parsed, struct snd_midi_chan
 }
 
 
-#ifdef CONFIG_SND_SEQUENCER_OSS
+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)
 /*
  * OSS ioctl callback
  */
diff --git a/sound/isa/sb/emu8000_pcm.c b/sound/isa/sb/emu8000_pcm.c
index 32f234f494e5..2ee8d67871ec 100644
--- a/sound/isa/sb/emu8000_pcm.c
+++ b/sound/isa/sb/emu8000_pcm.c
@@ -422,143 +422,148 @@ do { \
                 return -EAGAIN;\
 } while (0)
 
+enum {
+        COPY_USER, COPY_KERNEL, FILL_SILENCE,
+};
+
+#define GET_VAL(sval, buf, mode)                                        \
+        do {                                                            \
+                switch (mode) {                                         \
+                case FILL_SILENCE:                                      \
+                        sval = 0;                                       \
+                        break;                                          \
+                case COPY_KERNEL:                                       \
+                        sval = *buf++;                                  \
+                        break;                                          \
+                default:                                                \
+                        if (get_user(sval, (unsigned short __user *)buf)) \
+                                return -EFAULT;                         \
+                        buf++;                                          \
+                        break;                                          \
+                }                                                       \
+        } while (0)
 
 #ifdef USE_NONINTERLEAVE
+
+#define LOOP_WRITE(rec, offset, _buf, count, mode)              \
+        do {                                                    \
+                struct snd_emu8000 *emu = (rec)->emu;           \
+                unsigned short *buf = (unsigned short *)(_buf); \
+                snd_emu8000_write_wait(emu, 1);                 \
+                EMU8000_SMALW_WRITE(emu, offset);               \
+                while (count > 0) {                             \
+                        unsigned short sval;                    \
+                        CHECK_SCHEDULER();                      \
+                        GET_VAL(sval, buf, mode);               \
+                        EMU8000_SMLD_WRITE(emu, sval);          \
+                        count--;                                \
+                }                                               \
+        } while (0)
+
 /* copy one channel block */
-static int emu8k_transfer_block(struct snd_emu8000 *emu, int offset, unsigned short *buf, int count)
+static int emu8k_pcm_copy(struct snd_pcm_substream *subs,
+                          int voice, unsigned long pos,
+                          void __user *src, unsigned long count)
 {
-        EMU8000_SMALW_WRITE(emu, offset);
-        while (count > 0) {
-                unsigned short sval;
-                CHECK_SCHEDULER();
-                if (get_user(sval, buf))
-                        return -EFAULT;
-                EMU8000_SMLD_WRITE(emu, sval);
-                buf++;
-                count--;
-        }
+        struct snd_emu8k_pcm *rec = subs->runtime->private_data;
+
+        /* convert to word unit */
+        pos = (pos << 1) + rec->loop_start[voice];
+        count <<= 1;
+        LOOP_WRITE(rec, pos, src, count, COPY_UESR);
         return 0;
 }
 
-static int emu8k_pcm_copy(struct snd_pcm_substream *subs,
-                          int voice,
-                          snd_pcm_uframes_t pos,
-                          void *src,
-                          snd_pcm_uframes_t count)
+static int emu8k_pcm_copy_kernel(struct snd_pcm_substream *subs,
+                                 int voice, unsigned long pos,
+                                 void *src, unsigned long count)
 {
         struct snd_emu8k_pcm *rec = subs->runtime->private_data;
-        struct snd_emu8000 *emu = rec->emu;
-
-        snd_emu8000_write_wait(emu, 1);
-        if (voice == -1) {
-                unsigned short *buf = src;
-                int i, err;
-                count /= rec->voices;
-                for (i = 0; i < rec->voices; i++) {
-                        err = emu8k_transfer_block(emu, pos + rec->loop_start[i], buf, count);
-                        if (err < 0)
-                                return err;
-                        buf += count;
-                }
-                return 0;
-        } else {
-                return emu8k_transfer_block(emu, pos + rec->loop_start[voice], src, count);
-        }
-}
 
-/* make a channel block silence */
-static int emu8k_silence_block(struct snd_emu8000 *emu, int offset, int count)
-{
-        EMU8000_SMALW_WRITE(emu, offset);
-        while (count > 0) {
-                CHECK_SCHEDULER();
-                EMU8000_SMLD_WRITE(emu, 0);
-                count--;
-        }
+        /* convert to word unit */
+        pos = (pos << 1) + rec->loop_start[voice];
+        count <<= 1;
+        LOOP_WRITE(rec, pos, src, count, COPY_KERNEL);
         return 0;
 }
 
+/* make a channel block silence */
 static int emu8k_pcm_silence(struct snd_pcm_substream *subs,
-                             int voice,
-                             snd_pcm_uframes_t pos,
-                             snd_pcm_uframes_t count)
+                             int voice, unsigned long pos, unsigned long count)
 {
         struct snd_emu8k_pcm *rec = subs->runtime->private_data;
-        struct snd_emu8000 *emu = rec->emu;
-
-        snd_emu8000_write_wait(emu, 1);
-        if (voice == -1 && rec->voices == 1)
-                voice = 0;
-        if (voice == -1) {
-                int err;
-                err = emu8k_silence_block(emu, pos + rec->loop_start[0], count / 2);
-                if (err < 0)
-                        return err;
-                return emu8k_silence_block(emu, pos + rec->loop_start[1], count / 2);
-        } else {
-                return emu8k_silence_block(emu, pos + rec->loop_start[voice], count);
-        }
+
+        /* convert to word unit */
+        pos = (pos << 1) + rec->loop_start[voice];
+        count <<= 1;
+        LOOP_WRITE(rec, pos, NULL, count, FILL_SILENCE);
+        return 0;
 }
 
 #else /* interleave */
 
+#define LOOP_WRITE(rec, pos, _buf, count, mode)                         \
+        do {                                                            \
+                struct snd_emu8000 *emu = rec->emu;                     \
+                unsigned short *buf = (unsigned short *)(_buf);         \
+                snd_emu8000_write_wait(emu, 1);                         \
+                EMU8000_SMALW_WRITE(emu, pos + rec->loop_start[0]);     \
+                if (rec->voices > 1)                                    \
+                        EMU8000_SMARW_WRITE(emu, pos + rec->loop_start[1]); \
+                while (count > 0) {                                     \
+                        unsigned short sval;                            \
+                        CHECK_SCHEDULER();                              \
+                        GET_VAL(sval, buf, mode);                       \
+                        EMU8000_SMLD_WRITE(emu, sval);                  \
+                        if (rec->voices > 1) {                          \
+                                CHECK_SCHEDULER();                      \
+                                GET_VAL(sval, buf, mode);               \
+                                EMU8000_SMRD_WRITE(emu, sval);          \
+                        }                                               \
+                        count--;                                        \
+                }                                                       \
+        } while (0)
+
+
 /*
  * copy the interleaved data can be done easily by using
  * DMA "left" and "right" channels on emu8k engine.
  */
 static int emu8k_pcm_copy(struct snd_pcm_substream *subs,
-                          int voice,
-                          snd_pcm_uframes_t pos,
-                          void __user *src,
-                          snd_pcm_uframes_t count)
+                          int voice, unsigned long pos,
+                          void __user *src, unsigned long count)
 {
         struct snd_emu8k_pcm *rec = subs->runtime->private_data;
-        struct snd_emu8000 *emu = rec->emu;
-        unsigned short __user *buf = src;
 
-        snd_emu8000_write_wait(emu, 1);
-        EMU8000_SMALW_WRITE(emu, pos + rec->loop_start[0]);
-        if (rec->voices > 1)
-                EMU8000_SMARW_WRITE(emu, pos + rec->loop_start[1]);
-
-        while (count-- > 0) {
-                unsigned short sval;
-                CHECK_SCHEDULER();
-                if (get_user(sval, buf))
-                        return -EFAULT;
-                EMU8000_SMLD_WRITE(emu, sval);
-                buf++;
-                if (rec->voices > 1) {
-                        CHECK_SCHEDULER();
-                        if (get_user(sval, buf))
-                                return -EFAULT;
-                        EMU8000_SMRD_WRITE(emu, sval);
-                        buf++;
-                }
-        }
+        /* convert to frames */
+        pos = bytes_to_frames(subs->runtime, pos);
+        count = bytes_to_frames(subs->runtime, count);
+        LOOP_WRITE(rec, pos, src, count, COPY_USER);
+        return 0;
+}
+
+static int emu8k_pcm_copy_kernel(struct snd_pcm_substream *subs,
+                                 int voice, unsigned long pos,
+                                 void *src, unsigned long count)
+{
+        struct snd_emu8k_pcm *rec = subs->runtime->private_data;
+
+        /* convert to frames */
+        pos = bytes_to_frames(subs->runtime, pos);
+        count = bytes_to_frames(subs->runtime, count);
+        LOOP_WRITE(rec, pos, src, count, COPY_KERNEL);
         return 0;
 }
 
 static int emu8k_pcm_silence(struct snd_pcm_substream *subs,
-                             int voice,
-                             snd_pcm_uframes_t pos,
-                             snd_pcm_uframes_t count)
+                             int voice, unsigned long pos, unsigned long count)
 {
         struct snd_emu8k_pcm *rec = subs->runtime->private_data;
-        struct snd_emu8000 *emu = rec->emu;
 
-        snd_emu8000_write_wait(emu, 1);
-        EMU8000_SMALW_WRITE(emu, rec->loop_start[0] + pos);
-        if (rec->voices > 1)
-                EMU8000_SMARW_WRITE(emu, rec->loop_start[1] + pos);
-        while (count-- > 0) {
-                CHECK_SCHEDULER();
-                EMU8000_SMLD_WRITE(emu, 0);
-                if (rec->voices > 1) {
-                        CHECK_SCHEDULER();
-                        EMU8000_SMRD_WRITE(emu, 0);
-                }
-        }
+        /* convert to frames */
+        pos = bytes_to_frames(subs->runtime, pos);
+        count = bytes_to_frames(subs->runtime, count);
+        LOOP_WRITE(rec, pos, NULL, count, FILL_SILENCE);
         return 0;
 }
 #endif
@@ -674,8 +679,9 @@ static struct snd_pcm_ops emu8k_pcm_ops = {
         .prepare =      emu8k_pcm_prepare,
         .trigger =      emu8k_pcm_trigger,
         .pointer =      emu8k_pcm_pointer,
-        .copy =         emu8k_pcm_copy,
-        .silence =      emu8k_pcm_silence,
+        .copy_user =    emu8k_pcm_copy,
+        .copy_kernel =  emu8k_pcm_copy_kernel,
+        .fill_silence = emu8k_pcm_silence,
 };
 
 
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 3b2e4f405ff2..917a93d696c3 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -62,7 +62,7 @@ MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB AWE 32},"
 #define SNDRV_DEBUG_IRQ
 #endif
 
-#if defined(SNDRV_SBAWE) && (defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE)))
+#if defined(SNDRV_SBAWE) && IS_ENABLED(CONFIG_SND_SEQUENCER)
 #define SNDRV_SBAWE_EMU8000
 #endif
 
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c
index 48da2276683d..fa5780bb0c68 100644
--- a/sound/isa/sb/sb16_csp.c
+++ b/sound/isa/sb/sb16_csp.c
@@ -1029,7 +1029,7 @@ static int snd_sb_qsound_space_put(struct snd_kcontrol *kcontrol, struct snd_ctl
         return change;
 }
 
-static struct snd_kcontrol_new snd_sb_qsound_switch = {
+static const struct snd_kcontrol_new snd_sb_qsound_switch = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "3D Control - Switch",
         .info = snd_sb_qsound_switch_info,
@@ -1037,7 +1037,7 @@ static struct snd_kcontrol_new snd_sb_qsound_switch = {
         .put = snd_sb_qsound_switch_put
 };
 
-static struct snd_kcontrol_new snd_sb_qsound_space = {
+static const struct snd_kcontrol_new snd_sb_qsound_space = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "3D Control - Space",
         .info = snd_sb_qsound_space_info,
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
index 8b2d6c6bfe97..4be1350f6649 100644
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
@@ -737,7 +737,7 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ct
         return change;
 }
 
-static struct snd_kcontrol_new snd_sb16_dma_control = {
+static const struct snd_kcontrol_new snd_sb16_dma_control = {
         .iface = SNDRV_CTL_ELEM_IFACE_CARD,
         .name = "16-bit DMA Allocation",
         .info = snd_sb16_dma_control_info,
diff --git a/sound/isa/sb/sb8_main.c b/sound/isa/sb/sb8_main.c
index 9043397fe62f..0f302be4fb6d 100644
--- a/sound/isa/sb/sb8_main.c
+++ b/sound/isa/sb/sb8_main.c
@@ -46,19 +46,19 @@ MODULE_LICENSE("GPL");
 #define SB8_DEN(v)      ((SB8_CLOCK + (v) / 2) / (v))
 #define SB8_RATE(v)     (SB8_CLOCK / SB8_DEN(v))
 
-static struct snd_ratnum clock = {
+static const struct snd_ratnum clock = {
         .num = SB8_CLOCK,
         .den_min = 1,
         .den_max = 256,
         .den_step = 1,
 };
 
-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clock = {
+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clock = {
         .nrats = 1,
         .rats = &clock,
 };
 
-static struct snd_ratnum stereo_clocks[] = {
+static const struct snd_ratnum stereo_clocks[] = {
         {
                 .num = SB8_CLOCK,
                 .den_min = SB8_DEN(22050),
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 54f5758a1bb3..1cd2908e4f12 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -671,7 +671,7 @@ __skip_change:
         return change;
 }
 
-static struct snd_kcontrol_new midi_mixer_ctl = {
+static const struct snd_kcontrol_new midi_mixer_ctl = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "MIDI",
         .info = sscape_midi_info,
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c
index 913b731d2236..9f4e2e34cbe1 100644
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@ -69,12 +69,12 @@ static unsigned char freq_bits[14] = {
         /* 48000 */     0x0C | CS4231_XTAL1
 };
 
-static unsigned int rates[14] = {
+static const unsigned int rates[14] = {
         5510, 6620, 8000, 9600, 11025, 16000, 18900, 22050,
         27042, 32000, 33075, 37800, 44100, 48000
 };
 
-static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
+static const struct snd_pcm_hw_constraint_list hw_constraints_rates = {
         .count = ARRAY_SIZE(rates),
         .list = rates,
         .mask = 0,