leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: ac97: More constifications

Browse Source 
Apply const prefix to each possible place: the static tables for
registers and bits, the quirk tables, etc.

Just for minor optimization and no functional changes.

Link: https://lore.kernel.org/r/20200105144823.29547-11-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2020-01-05 15:47:25 +01:00
parent bf82326fce
commit 1675bfc0fb
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/pci/ac97/ac97_codec.c
View File

@ -1753,10 +1753,10 @@ static unsigned int snd_ac97_determine_spdif_rates(struct snd_ac97 *ac97)
{ {
unsigned int result = 0; unsigned int result = 0;
int i; int i;
static unsigned short ctl_bits[] = { static const unsigned short ctl_bits[] = {
AC97_SC_SPSR_44K, AC97_SC_SPSR_32K, AC97_SC_SPSR_48K AC97_SC_SPSR_44K, AC97_SC_SPSR_32K, AC97_SC_SPSR_48K
}; };
static unsigned int rate_bits[] = { static const unsigned int rate_bits[] = {
SNDRV_PCM_RATE_44100, SNDRV_PCM_RATE_32000, SNDRV_PCM_RATE_48000 SNDRV_PCM_RATE_44100, SNDRV_PCM_RATE_32000, SNDRV_PCM_RATE_48000
}; };
@ -2346,7 +2346,7 @@ struct ac97_power_reg {
enum { PWIDX_ADC, PWIDX_FRONT, PWIDX_CLFE, PWIDX_SURR, PWIDX_MIC, PWIDX_SIZE }; enum { PWIDX_ADC, PWIDX_FRONT, PWIDX_CLFE, PWIDX_SURR, PWIDX_MIC, PWIDX_SIZE };
static struct ac97_power_reg power_regs[PWIDX_SIZE] = { static const struct ac97_power_reg power_regs[PWIDX_SIZE] = {
[PWIDX_ADC] = { AC97_PCM_LR_ADC_RATE, AC97_POWERDOWN, AC97_PD_PR0}, [PWIDX_ADC] = { AC97_PCM_LR_ADC_RATE, AC97_POWERDOWN, AC97_PD_PR0},
[PWIDX_FRONT] = { AC97_PCM_FRONT_DAC_RATE, AC97_POWERDOWN, AC97_PD_PR1}, [PWIDX_FRONT] = { AC97_PCM_FRONT_DAC_RATE, AC97_POWERDOWN, AC97_PD_PR1},
[PWIDX_CLFE] = { AC97_PCM_LFE_DAC_RATE, AC97_EXTENDED_STATUS, [PWIDX_CLFE] = { AC97_PCM_LFE_DAC_RATE, AC97_EXTENDED_STATUS,
@ -2829,7 +2829,7 @@ struct quirk_table {
int (*func)(struct snd_ac97 *); int (*func)(struct snd_ac97 *);
}; };
static struct quirk_table applicable_quirks[] = { static const struct quirk_table applicable_quirks[] = {
{ "none", NULL }, { "none", NULL },
{ "hp_only", tune_hp_only }, { "hp_only", tune_hp_only },
{ "swap_hp", tune_swap_hp }, { "swap_hp", tune_swap_hp },
@ -2857,7 +2857,7 @@ static int apply_quirk(struct snd_ac97 *ac97, int type)
static int apply_quirk_str(struct snd_ac97 *ac97, const char *typestr) static int apply_quirk_str(struct snd_ac97 *ac97, const char *typestr)
{ {
int i; int i;
struct quirk_table *q; const struct quirk_table *q;
for (i = 0; i < ARRAY_SIZE(applicable_quirks); i++) { for (i = 0; i < ARRAY_SIZE(applicable_quirks); i++) {
q = &applicable_quirks[i]; q = &applicable_quirks[i];

26
sound/pci/ac97/ac97_patch.c
View File

@ -1211,25 +1211,25 @@ static const struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {
static int patch_sigmatel_stac9758(struct snd_ac97 * ac97) static int patch_sigmatel_stac9758(struct snd_ac97 * ac97)
{ {
static unsigned short regs[4] = { static const unsigned short regs[4] = {
AC97_SIGMATEL_OUTSEL, AC97_SIGMATEL_OUTSEL,
AC97_SIGMATEL_IOMISC, AC97_SIGMATEL_IOMISC,
AC97_SIGMATEL_INSEL, AC97_SIGMATEL_INSEL,
AC97_SIGMATEL_VARIOUS AC97_SIGMATEL_VARIOUS
}; };
static unsigned short def_regs[4] = { static const unsigned short def_regs[4] = {
/* OUTSEL */ 0xd794, /* CL:CL, SR:SR, LO:MX, LI:DS, MI:DS */ /* OUTSEL */ 0xd794, /* CL:CL, SR:SR, LO:MX, LI:DS, MI:DS */
/* IOMISC */ 0x2001, /* IOMISC */ 0x2001,
/* INSEL */ 0x0201, /* LI:LI, MI:M1 */ /* INSEL */ 0x0201, /* LI:LI, MI:M1 */
/* VARIOUS */ 0x0040 /* VARIOUS */ 0x0040
}; };
static unsigned short m675_regs[4] = { static const unsigned short m675_regs[4] = {
/* OUTSEL */ 0xfc70, /* CL:MX, SR:MX, LO:DS, LI:MX, MI:DS */ /* OUTSEL */ 0xfc70, /* CL:MX, SR:MX, LO:DS, LI:MX, MI:DS */
/* IOMISC */ 0x2102, /* HP amp on */ /* IOMISC */ 0x2102, /* HP amp on */
/* INSEL */ 0x0203, /* LI:LI, MI:FR */ /* INSEL */ 0x0203, /* LI:LI, MI:FR */
/* VARIOUS */ 0x0041 /* stereo mic */ /* VARIOUS */ 0x0041 /* stereo mic */
}; };
unsigned short *pregs = def_regs; const unsigned short *pregs = def_regs;
int i; int i;
/* Gateway M675 notebook */ /* Gateway M675 notebook */
@ -1361,7 +1361,7 @@ static int patch_cx20551(struct snd_ac97 *ac97)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static void ad18xx_resume(struct snd_ac97 *ac97) static void ad18xx_resume(struct snd_ac97 *ac97)
{ {
static unsigned short setup_regs[] = { static const unsigned short setup_regs[] = {
AC97_AD_MISC, AC97_AD_SERIAL_CFG, AC97_AD_JACK_SPDIF, AC97_AD_MISC, AC97_AD_SERIAL_CFG, AC97_AD_JACK_SPDIF,
}; };
int i, codec; int i, codec;
@ -1470,7 +1470,7 @@ static unsigned short patch_ad1881_unchained(struct snd_ac97 * ac97, int idx, un
static int patch_ad1881_chained1(struct snd_ac97 * ac97, int idx, unsigned short codec_bits) static int patch_ad1881_chained1(struct snd_ac97 * ac97, int idx, unsigned short codec_bits)
{ {
static int cfg_bits[3] = { 1<<12, 1<<14, 1<<13 }; static const int cfg_bits[3] = { 1<<12, 1<<14, 1<<13 };
unsigned short val; unsigned short val;
snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, cfg_bits[idx]); snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, cfg_bits[idx]);
@ -1794,7 +1794,7 @@ static const struct snd_kcontrol_new snd_ac97_ad1981x_jack_sense[] = {
/* black list to avoid HP/Line jack-sense controls /* black list to avoid HP/Line jack-sense controls
* (SS vendor << 16 | device) * (SS vendor << 16 | device)
*/ */
static unsigned int ad1981_jacks_blacklist[] = { static const unsigned int ad1981_jacks_blacklist[] = {
0x10140523, /* Thinkpad R40 */ 0x10140523, /* Thinkpad R40 */
0x10140534, /* Thinkpad X31 */ 0x10140534, /* Thinkpad X31 */
0x10140537, /* Thinkpad T41p */ 0x10140537, /* Thinkpad T41p */
@ -1838,7 +1838,7 @@ static const struct snd_ac97_build_ops patch_ad1981a_build_ops = {
/* white list to enable HP jack-sense bits /* white list to enable HP jack-sense bits
* (SS vendor << 16 | device) * (SS vendor << 16 | device)
*/ */
static unsigned int ad1981_jacks_whitelist[] = { static const unsigned int ad1981_jacks_whitelist[] = {
0x0e11005a, /* HP nc4000/4010 */ 0x0e11005a, /* HP nc4000/4010 */
0x103c0890, /* HP nc6000 */ 0x103c0890, /* HP nc6000 */
0x103c0938, /* HP nc4220 */ 0x103c0938, /* HP nc4220 */
@ -3116,22 +3116,22 @@ static void cm9761_update_jacks(struct snd_ac97 *ac97)
/* FIXME: check the bits for each model /* FIXME: check the bits for each model
* model 83 is confirmed to work * model 83 is confirmed to work
*/ */
static unsigned short surr_on[3][2] = { static const unsigned short surr_on[3][2] = {
{ 0x0008, 0x0000 }, /* 9761-78 & 82 */ { 0x0008, 0x0000 }, /* 9761-78 & 82 */
{ 0x0000, 0x0008 }, /* 9761-82 rev.B */ { 0x0000, 0x0008 }, /* 9761-82 rev.B */
{ 0x0000, 0x0008 }, /* 9761-83 */ { 0x0000, 0x0008 }, /* 9761-83 */
}; };
static unsigned short clfe_on[3][2] = { static const unsigned short clfe_on[3][2] = {
{ 0x0000, 0x1000 }, /* 9761-78 & 82 */ { 0x0000, 0x1000 }, /* 9761-78 & 82 */
{ 0x1000, 0x0000 }, /* 9761-82 rev.B */ { 0x1000, 0x0000 }, /* 9761-82 rev.B */
{ 0x0000, 0x1000 }, /* 9761-83 */ { 0x0000, 0x1000 }, /* 9761-83 */
}; };
static unsigned short surr_shared[3][2] = { static const unsigned short surr_shared[3][2] = {
{ 0x0000, 0x0400 }, /* 9761-78 & 82 */ { 0x0000, 0x0400 }, /* 9761-78 & 82 */
{ 0x0000, 0x0400 }, /* 9761-82 rev.B */ { 0x0000, 0x0400 }, /* 9761-82 rev.B */
{ 0x0000, 0x0400 }, /* 9761-83 */ { 0x0000, 0x0400 }, /* 9761-83 */
}; };
static unsigned short clfe_shared[3][2] = { static const unsigned short clfe_shared[3][2] = {
{ 0x2000, 0x0880 }, /* 9761-78 & 82 */ { 0x2000, 0x0880 }, /* 9761-78 & 82 */
{ 0x0000, 0x2880 }, /* 9761-82 rev.B */ { 0x0000, 0x2880 }, /* 9761-82 rev.B */
{ 0x2000, 0x0800 }, /* 9761-83 */ { 0x2000, 0x0800 }, /* 9761-83 */
@ -3635,7 +3635,7 @@ struct vt1618_uaj_item {
/* This list reflects the vt1618 docs for Vendor Defined Register 0x60. */ /* This list reflects the vt1618 docs for Vendor Defined Register 0x60. */
static struct vt1618_uaj_item vt1618_uaj[3] = { static const struct vt1618_uaj_item vt1618_uaj[3] = {
{ {
/* speaker jack */ /* speaker jack */
.mask = 0x03, .mask = 0x03,

4
sound/pci/ac97/ac97_pcm.c
View File

@ -26,7 +26,7 @@
* PCM support * PCM support
*/ */
static unsigned char rate_reg_tables[2][4][9] = { static const unsigned char rate_reg_tables[2][4][9] = {
{ {
/* standard rates */ /* standard rates */
{ {
@ -129,7 +129,7 @@ static unsigned char rate_reg_tables[2][4][9] = {
}}; }};
/* FIXME: more various mappings for ADC? */ /* FIXME: more various mappings for ADC? */
static unsigned char rate_cregs[9] = { static const unsigned char rate_cregs[9] = {
AC97_PCM_LR_ADC_RATE, /* 3 */ AC97_PCM_LR_ADC_RATE, /* 3 */
AC97_PCM_LR_ADC_RATE, /* 4 */ AC97_PCM_LR_ADC_RATE, /* 4 */
0xff, /* 5 */ 0xff, /* 5 */