[ALSA] Add even more 'const' to everything related to TLV
Mark TLV data as 'const' Signed-of-by: Philipp Matthias Hahn <pmhahn@pmhahn.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:

committed by
Jaroslav Kysela

parent
517400cbc7
commit
0cb29ea0d4
@@ -1190,13 +1190,13 @@ static int snd_ac97_cmute_new_stereo(struct snd_card *card, char *name, int reg,
|
||||
/*
|
||||
* set dB information
|
||||
*/
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_4bit, -4500, 300, 0);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_5bit, -4650, 150, 0);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_6bit, -9450, 150, 0);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_4bit, -4500, 300, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_5bit, -4650, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_6bit, -9450, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);
|
||||
|
||||
static unsigned int *find_db_scale(unsigned int maxval)
|
||||
static const unsigned int *find_db_scale(unsigned int maxval)
|
||||
{
|
||||
switch (maxval) {
|
||||
case 0x0f: return db_scale_4bit;
|
||||
@@ -1206,8 +1206,8 @@ static unsigned int *find_db_scale(unsigned int maxval)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void set_tlv_db_scale(struct snd_kcontrol *kctl, unsigned int *tlv)
|
||||
{
|
||||
static void set_tlv_db_scale(struct snd_kcontrol *kctl, const unsigned int *tlv)
|
||||
{
|
||||
kctl->tlv.p = tlv;
|
||||
if (tlv)
|
||||
kctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;
|
||||
|
@@ -54,7 +54,7 @@ static int patch_build_controls(struct snd_ac97 * ac97, const struct snd_kcontro
|
||||
|
||||
/* replace with a new TLV */
|
||||
static void reset_tlv(struct snd_ac97 *ac97, const char *name,
|
||||
unsigned int *tlv)
|
||||
const unsigned int *tlv)
|
||||
{
|
||||
struct snd_ctl_elem_id sid;
|
||||
struct snd_kcontrol *kctl;
|
||||
@@ -1569,7 +1569,7 @@ static const struct snd_kcontrol_new snd_ac97_controls_ad1885[] = {
|
||||
AC97_SINGLE("Line Jack Sense", AC97_AD_JACK_SPDIF, 8, 1, 1), /* inverted */
|
||||
};
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_6bit_6db_max, -8850, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_6bit_6db_max, -8850, 150, 0);
|
||||
|
||||
static int patch_ad1885_specific(struct snd_ac97 * ac97)
|
||||
{
|
||||
@@ -2527,7 +2527,7 @@ static const struct snd_kcontrol_new snd_ac97_spdif_controls_alc650[] = {
|
||||
/* AC97_SINGLE("IEC958 Input Monitor", AC97_ALC650_MULTICH, 13, 1, 0), */
|
||||
};
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_5bit_3db_max, -4350, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_5bit_3db_max, -4350, 150, 0);
|
||||
|
||||
static int patch_alc650_specific(struct snd_ac97 * ac97)
|
||||
{
|
||||
|
@@ -267,9 +267,9 @@ static int snd_ak4531_put_input_sw(struct snd_kcontrol *kcontrol, struct snd_ctl
|
||||
return change;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_master, -6200, 200, 0);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_mono, -2800, 400, 0);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_input, -5000, 200, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_master, -6200, 200, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_mono, -2800, 400, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_input, -5000, 200, 0);
|
||||
|
||||
static struct snd_kcontrol_new snd_ak4531_controls[] = {
|
||||
|
||||
|
@@ -74,8 +74,8 @@
|
||||
|
||||
#include "ca0106.h"
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale1, -5175, 25, 1);
|
||||
static DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale2, -10350, 50, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale1, -5175, 25, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale2, -10350, 50, 1);
|
||||
|
||||
static int snd_ca0106_shared_spdif_info(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_info *uinfo)
|
||||
|
@@ -1055,7 +1055,7 @@ static int snd_cs4281_put_volume(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_dsp, -4650, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_dsp, -4650, 150, 0);
|
||||
|
||||
static struct snd_kcontrol_new snd_cs4281_fm_vol =
|
||||
{
|
||||
|
@@ -34,7 +34,7 @@ module_param_array(enable, bool, NULL, 0444);
|
||||
MODULE_PARM_DESC(enable, "Enable " ECHOCARD_NAME " soundcard.");
|
||||
|
||||
static unsigned int channels_list[10] = {1, 2, 4, 6, 8, 10, 12, 14, 16, 999999};
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_output_gain, -12800, 100, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_output_gain, -12800, 100, 1);
|
||||
|
||||
static int get_firmware(const struct firmware **fw_entry,
|
||||
const struct firmware *frm, struct echoaudio *chip)
|
||||
@@ -1085,7 +1085,7 @@ static int snd_echo_input_gain_put(struct snd_kcontrol *kcontrol,
|
||||
return changed;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_input_gain, -2500, 50, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_input_gain, -2500, 50, 0);
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_line_input_gain __devinitdata = {
|
||||
.name = "Line Capture Volume",
|
||||
|
@@ -296,7 +296,7 @@ static const u32 db_table[101] = {
|
||||
};
|
||||
|
||||
/* EMU10k1/EMU10k2 DSP control db gain */
|
||||
static DECLARE_TLV_DB_SCALE(snd_emu10k1_db_scale1, -4000, 40, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(snd_emu10k1_db_scale1, -4000, 40, 1);
|
||||
|
||||
static const u32 onoff_table[2] = {
|
||||
0x00000000, 0x00000001
|
||||
@@ -657,7 +657,7 @@ snd_emu10k1_look_for_ctl(struct snd_emu10k1 *emu, struct snd_ctl_elem_id *id)
|
||||
|
||||
#define MAX_TLV_SIZE 256
|
||||
|
||||
static unsigned int *copy_tlv(unsigned int __user *_tlv)
|
||||
static unsigned int *copy_tlv(const unsigned int __user *_tlv)
|
||||
{
|
||||
unsigned int data[2];
|
||||
unsigned int *tlv;
|
||||
|
@@ -42,7 +42,7 @@
|
||||
|
||||
#define AC97_ID_STAC9758 0x83847658
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(snd_audigy_db_scale2, -10350, 50, 1); /* WM8775 gain scale */
|
||||
static const DECLARE_TLV_DB_SCALE(snd_audigy_db_scale2, -10350, 50, 1); /* WM8775 gain scale */
|
||||
|
||||
static int snd_emu10k1_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
|
@@ -785,7 +785,7 @@ static int snd_p16v_capture_channel_put(struct snd_kcontrol *kcontrol,
|
||||
}
|
||||
return change;
|
||||
}
|
||||
static DECLARE_TLV_DB_SCALE(snd_p16v_db_scale1, -5175, 25, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(snd_p16v_db_scale1, -5175, 25, 1);
|
||||
|
||||
#define P16V_VOL(xname,xreg,xhl) { \
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
|
||||
|
@@ -1344,7 +1344,7 @@ static unsigned int db_scale_line[] = {
|
||||
8, 15, TLV_DB_SCALE_ITEM(-750, 150, 0),
|
||||
};
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_capture, 0, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_capture, 0, 150, 0);
|
||||
|
||||
static struct snd_kcontrol_new snd_es1938_controls[] = {
|
||||
ES1938_DOUBLE_TLV("Master Playback Volume", 0, 0x60, 0x62, 0, 0, 63, 0,
|
||||
|
@@ -1157,7 +1157,7 @@ static int snd_fm801_put_mux(struct snd_kcontrol *kcontrol,
|
||||
return snd_fm801_update_bits(chip, FM801_REC_SRC, 7, val);
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_dsp, -3450, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_dsp, -3450, 150, 0);
|
||||
|
||||
#define FM801_CONTROLS ARRAY_SIZE(snd_fm801_controls)
|
||||
|
||||
|
@@ -664,11 +664,11 @@ static int aureon_ac97_mmute_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
|
||||
return change;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_wm_pcm, -6400, 50, 1);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_wm_adc, -1200, 100, 0);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_ac97_master, -4650, 150, 0);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_ac97_gain, -3450, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_wm_pcm, -6400, 50, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_wm_adc, -1200, 100, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_ac97_master, -4650, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_ac97_gain, -3450, 150, 0);
|
||||
|
||||
/*
|
||||
* Logarithmic volume values for WM8770
|
||||
|
@@ -1378,7 +1378,7 @@ static int snd_ice1712_pro_mixer_volume_put(struct snd_kcontrol *kcontrol, struc
|
||||
return change;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_playback, -14400, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_playback, -14400, 150, 0);
|
||||
|
||||
static const struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] __devinitdata = {
|
||||
{
|
||||
|
@@ -697,8 +697,8 @@ static int phase28_oversampling_put(struct snd_kcontrol *kcontrol, struct snd_ct
|
||||
return 0;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_wm_pcm, -6400, 50, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_wm_dac, -12700, 100, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_wm_pcm, -6400, 50, 1);
|
||||
|
||||
static const struct snd_kcontrol_new phase28_dac_controls[] __devinitdata = {
|
||||
{
|
||||
|
@@ -565,7 +565,7 @@ static int pontis_gpio_data_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el
|
||||
return changed;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_volume, -6400, 50, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_volume, -6400, 50, 1);
|
||||
|
||||
/*
|
||||
* mixers
|
||||
|
@@ -357,8 +357,8 @@ static int aureon_oversampling_put(struct snd_kcontrol *kcontrol, struct snd_ctl
|
||||
}
|
||||
#endif
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_dac, -19125, 75, 0);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_adc, 0, 150, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_dac, -19125, 75, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_adc, 0, 150, 0);
|
||||
|
||||
/*
|
||||
* mixers
|
||||
|
@@ -389,7 +389,7 @@ static int mixart_analog_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
|
||||
return changed;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_analog, -9600, 50, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_analog, -9600, 50, 0);
|
||||
|
||||
static struct snd_kcontrol_new mixart_control_analog_level = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
@@ -872,7 +872,7 @@ static int mixart_pcm_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
|
||||
return changed;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_digital, -10950, 50, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_digital, -10950, 50, 0);
|
||||
|
||||
static struct snd_kcontrol_new snd_mixart_pcm_vol =
|
||||
{
|
||||
|
@@ -44,8 +44,8 @@
|
||||
#define PCXHR_ANALOG_PLAYBACK_LEVEL_MAX 128 /* 0.0 dB */
|
||||
#define PCXHR_ANALOG_PLAYBACK_ZERO_LEVEL 104 /* -24.0 dB ( 0.0 dB - fix level +24.0 dB ) */
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_analog_capture, -9600, 50, 0);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_analog_playback, -12800, 100, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_analog_capture, -9600, 50, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_analog_playback, -12800, 100, 0);
|
||||
|
||||
static int pcxhr_update_analog_audio_level(struct snd_pcxhr *chip, int is_capture, int channel)
|
||||
{
|
||||
@@ -195,7 +195,7 @@ static struct snd_kcontrol_new pcxhr_control_output_switch = {
|
||||
#define PCXHR_DIGITAL_LEVEL_MAX 0x1ff /* +18 dB */
|
||||
#define PCXHR_DIGITAL_ZERO_LEVEL 0x1b7 /* 0 dB */
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_digital, -10950, 50, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_digital, -10950, 50, 0);
|
||||
|
||||
#define MORE_THAN_ONE_STREAM_LEVEL 0x000001
|
||||
#define VALID_STREAM_PAN_LEVEL_MASK 0x800000
|
||||
|
@@ -2627,7 +2627,7 @@ static int snd_trident_vol_control_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_gvol, -6375, 25, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_gvol, -6375, 25, 0);
|
||||
|
||||
static int snd_trident_vol_control_put(struct snd_kcontrol *kcontrol,
|
||||
struct snd_ctl_elem_value *ucontrol)
|
||||
@@ -2844,7 +2844,7 @@ static int snd_trident_pcm_rvol_control_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_crvol, -3175, 25, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_crvol, -3175, 25, 1);
|
||||
|
||||
static struct snd_kcontrol_new snd_trident_pcm_rvol_control __devinitdata =
|
||||
{
|
||||
|
@@ -1699,7 +1699,7 @@ static int snd_via8233_pcmdxs_volume_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_dxs, -9450, 150, 1);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -9450, 150, 1);
|
||||
|
||||
static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = {
|
||||
.name = "PCM Playback Volume",
|
||||
|
@@ -73,8 +73,8 @@ MODULE_DEVICE_TABLE(pci, snd_vx222_ids);
|
||||
/*
|
||||
*/
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_old_vol, -11350, 50, 0);
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_akm, -7350, 50, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_old_vol, -11350, 50, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_akm, -7350, 50, 0);
|
||||
|
||||
static struct snd_vx_hardware vx222_old_hw = {
|
||||
|
||||
|
@@ -846,7 +846,7 @@ static void vx2_set_input_level(struct snd_vx222 *chip)
|
||||
|
||||
#define MIC_LEVEL_MAX 0xff
|
||||
|
||||
static DECLARE_TLV_DB_SCALE(db_scale_mic, -6450, 50, 0);
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_mic, -6450, 50, 0);
|
||||
|
||||
/*
|
||||
* controls API for input levels
|
||||
|
@@ -1504,7 +1504,7 @@ static int snd_ymfpci_put_single(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static DECLARE_TLV_DB_LINEAR(db_scale_native, TLV_DB_GAIN_MUTE, 0);
|
||||
static const DECLARE_TLV_DB_LINEAR(db_scale_native, TLV_DB_GAIN_MUTE, 0);
|
||||
|
||||
#define YMFPCI_DOUBLE(xname, xindex, reg) \
|
||||
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
|
||||
|
Reference in New Issue
Block a user