aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/cs46xx/cs46xx_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/cs46xx/cs46xx_lib.c')
-rw-r--r--sound/pci/cs46xx/cs46xx_lib.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index e4cf3187b4dd..709fb1a503b7 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -887,8 +887,8 @@ static int snd_cs46xx_playback_transfer(struct snd_pcm_substream *substream)
887{ 887{
888 struct snd_pcm_runtime *runtime = substream->runtime; 888 struct snd_pcm_runtime *runtime = substream->runtime;
889 struct snd_cs46xx_pcm * cpcm = runtime->private_data; 889 struct snd_cs46xx_pcm * cpcm = runtime->private_data;
890 snd_pcm_indirect_playback_transfer(substream, &cpcm->pcm_rec, snd_cs46xx_pb_trans_copy); 890 return snd_pcm_indirect_playback_transfer(substream, &cpcm->pcm_rec,
891 return 0; 891 snd_cs46xx_pb_trans_copy);
892} 892}
893 893
894static void snd_cs46xx_cp_trans_copy(struct snd_pcm_substream *substream, 894static void snd_cs46xx_cp_trans_copy(struct snd_pcm_substream *substream,
@@ -903,8 +903,8 @@ static void snd_cs46xx_cp_trans_copy(struct snd_pcm_substream *substream,
903static int snd_cs46xx_capture_transfer(struct snd_pcm_substream *substream) 903static int snd_cs46xx_capture_transfer(struct snd_pcm_substream *substream)
904{ 904{
905 struct snd_cs46xx *chip = snd_pcm_substream_chip(substream); 905 struct snd_cs46xx *chip = snd_pcm_substream_chip(substream);
906 snd_pcm_indirect_capture_transfer(substream, &chip->capt.pcm_rec, snd_cs46xx_cp_trans_copy); 906 return snd_pcm_indirect_capture_transfer(substream, &chip->capt.pcm_rec,
907 return 0; 907 snd_cs46xx_cp_trans_copy);
908} 908}
909 909
910static snd_pcm_uframes_t snd_cs46xx_playback_direct_pointer(struct snd_pcm_substream *substream) 910static snd_pcm_uframes_t snd_cs46xx_playback_direct_pointer(struct snd_pcm_substream *substream)
@@ -1482,9 +1482,9 @@ static struct snd_pcm_hardware snd_cs46xx_capture =
1482 1482
1483#ifdef CONFIG_SND_CS46XX_NEW_DSP 1483#ifdef CONFIG_SND_CS46XX_NEW_DSP
1484 1484
1485static unsigned int period_sizes[] = { 32, 64, 128, 256, 512, 1024, 2048 }; 1485static const unsigned int period_sizes[] = { 32, 64, 128, 256, 512, 1024, 2048 };
1486 1486
1487static struct snd_pcm_hw_constraint_list hw_constraints_period_sizes = { 1487static const struct snd_pcm_hw_constraint_list hw_constraints_period_sizes = {
1488 .count = ARRAY_SIZE(period_sizes), 1488 .count = ARRAY_SIZE(period_sizes),
1489 .list = period_sizes, 1489 .list = period_sizes,
1490 .mask = 0 1490 .mask = 0
@@ -2371,7 +2371,7 @@ static int snd_cs46xx_front_dup_put(struct snd_kcontrol *kcontrol,
2371 ucontrol->value.integer.value[0] ? 0 : 0x200); 2371 ucontrol->value.integer.value[0] ? 0 : 0x200);
2372} 2372}
2373 2373
2374static struct snd_kcontrol_new snd_cs46xx_front_dup_ctl = { 2374static const struct snd_kcontrol_new snd_cs46xx_front_dup_ctl = {
2375 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 2375 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
2376 .name = "Duplicate Front", 2376 .name = "Duplicate Front",
2377 .info = snd_mixer_boolean_info, 2377 .info = snd_mixer_boolean_info,