Commit bf82326f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda: More constifications 

Apply const prefix to the remaining possible places: the string
tables, the rate tables, the verb tables, the index tables, etc.

Just for minor optimization and no functional changes.

Link: https://lore.kernel.org/r/20200105144823.29547-10-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f729f88a

sound/hda/hdac_device.c

+2 −2
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ struct hda_vendor_id { 
	const char *name;

};



static struct hda_vendor_id hda_vendor_ids[] = {

static const struct hda_vendor_id hda_vendor_ids[] = {

	{ 0x1002, "ATI" },

	{ 0x1013, "Cirrus Logic" },

	{ 0x1057, "Motorola" },
@@ -692,7 +692,7 @@ struct hda_rate_tbl { 
	(AC_FMT_BASE_##base##K | (((mult) - 1) << AC_FMT_MULT_SHIFT) | \

	 (((div) - 1) << AC_FMT_DIV_SHIFT))



static struct hda_rate_tbl rate_bits[] = {

static const struct hda_rate_tbl rate_bits[] = {

	/* rate in Hz, ALSA rate bitmask, HDA format value */



	/* autodetected value used in snd_hda_query_supported_pcm */

sound/hda/hdmi_chmap.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static const char * const cea_speaker_allocation_names[] = { 
/*

 * ELD SA bits in the CEA Speaker Allocation data block

 */

static int eld_speaker_allocation_bits[] = {

static const int eld_speaker_allocation_bits[] = {

	[0] = FL | FR,

	[1] = LFE,

	[2] = FC,

sound/hda/intel-nhlt.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#define NHLT_ACPI_HEADER_SIG	"NHLT"



/* Unique identification for getting NHLT blobs */

static guid_t osc_guid =

static const guid_t osc_guid =

	GUID_INIT(0xA69F886E, 0x6CEB, 0x4594,

		  0xA4, 0x1F, 0x7B, 0x5D, 0xCE, 0x24, 0xC5, 0x53);

sound/pci/hda/hda_codec.c

+3 −3
Original line number Diff line number Diff line
@@ -3201,7 +3201,7 @@ static int get_empty_pcm_device(struct hda_bus *bus, unsigned int type) 
	/* assigned to static slots up to dev#10; if more needed, assign

	 * the later slot dynamically (when CONFIG_SND_DYNAMIC_MINORS=y)

	 */

	static int audio_idx[HDA_PCM_NTYPES][5] = {

	static const int audio_idx[HDA_PCM_NTYPES][5] = {

		[HDA_PCM_TYPE_AUDIO] = { 0, 2, 4, 5, -1 },

		[HDA_PCM_TYPE_SPDIF] = { 1, -1 },

		[HDA_PCM_TYPE_HDMI]  = { 3, 7, 8, 9, -1 },
@@ -3869,7 +3869,7 @@ EXPORT_SYMBOL_GPL(snd_hda_get_default_vref); 
unsigned int snd_hda_correct_pin_ctl(struct hda_codec *codec,

				     hda_nid_t pin, unsigned int val)

{

	static unsigned int cap_lists[][2] = {

	static const unsigned int cap_lists[][2] = {

		{ AC_PINCTL_VREF_100, AC_PINCAP_VREF_100 },

		{ AC_PINCTL_VREF_80, AC_PINCAP_VREF_80 },

		{ AC_PINCTL_VREF_50, AC_PINCAP_VREF_50 },
@@ -4014,7 +4014,7 @@ void snd_hda_bus_reset_codecs(struct hda_bus *bus) 
 */

void snd_print_pcm_bits(int pcm, char *buf, int buflen)

{

	static unsigned int bits[] = { 8, 16, 20, 24, 32 };

	static const unsigned int bits[] = { 8, 16, 20, 24, 32 };

	int i, j;



	for (i = 0, j = 0; i < ARRAY_SIZE(bits); i++)

sound/pci/hda/hda_eld.c

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static const char * const cea_audio_coding_type_names[] = { 
/*

 * SS1:SS0 index => sample size

 */

static int cea_sample_sizes[4] = {

static const int cea_sample_sizes[4] = {

	0,	 		/* 0: Refer to Stream Header */

	AC_SUPPCM_BITS_16,	/* 1: 16 bits */

	AC_SUPPCM_BITS_20,	/* 2: 20 bits */
@@ -108,7 +108,7 @@ static int cea_sample_sizes[4] = { 
/*

 * SF2:SF1:SF0 index => sampling frequency

 */

static int cea_sampling_frequencies[8] = {

static const int cea_sampling_frequencies[8] = {

	0,			/* 0: Refer to Stream Header */

	SNDRV_PCM_RATE_32000,	/* 1:  32000Hz */

	SNDRV_PCM_RATE_44100,	/* 2:  44100Hz */
@@ -352,7 +352,7 @@ int snd_hdmi_get_eld(struct hda_codec *codec, hda_nid_t nid, 
 */

static void hdmi_print_pcm_rates(int pcm, char *buf, int buflen)

{

	static unsigned int alsa_rates[] = {

	static const unsigned int alsa_rates[] = {

		5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000,

		88200, 96000, 176400, 192000, 384000

	};