Commit 15a1af95 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: gus: More constifications 

Apply const prefix to each possible place: the static resource tables,
the volume table, etc.

Just for minor optimization and no functional changes.

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


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

sound/isa/gus/gus_io.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ void snd_gf1_select_active_voices(struct snd_gus_card * gus) 
{

	unsigned short voices;



	static unsigned short voices_tbl[32 - 14 + 1] =

	static const unsigned short voices_tbl[32 - 14 + 1] =

	{

	    44100, 41160, 38587, 36317, 34300, 32494, 30870, 29400, 28063, 26843,

	    25725, 24696, 23746, 22866, 22050, 21289, 20580, 19916, 19293

sound/isa/gus/gus_main.c

+2 −2
Original line number Diff line number Diff line
@@ -267,9 +267,9 @@ static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches) 
	struct snd_card *card;

	unsigned long flags;

	int irq, dma1, dma2;

	static unsigned char irqs[16] =

	static const unsigned char irqs[16] =

		{0, 0, 1, 3, 0, 2, 0, 4, 0, 1, 0, 5, 6, 0, 0, 7};

	static unsigned char dmas[8] =

	static const unsigned char dmas[8] =

		{6, 1, 0, 2, 0, 3, 4, 5};



	if (snd_BUG_ON(!gus))

sound/isa/gus/gus_volume.c

+5 −4
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ unsigned int snd_gf1_calc_ramp_rate(struct snd_gus_card * gus, 
				    unsigned short end,

				    unsigned int us)

{

	static unsigned char vol_rates[19] =

	static const unsigned char vol_rates[19] =

	{

		23, 24, 26, 28, 29, 31, 32, 34,

		36, 37, 39, 40, 42, 44, 45, 47,
@@ -113,7 +113,7 @@ unsigned short snd_gf1_translate_freq(struct snd_gus_card * gus, unsigned int fr 


short snd_gf1_compute_vibrato(short cents, unsigned short fc_register)

{

	static short vibrato_table[] =

	static const short vibrato_table[] =

	{

		0, 0, 32, 592, 61, 1175, 93, 1808,

		124, 2433, 152, 3007, 182, 3632, 213, 4290,
@@ -121,7 +121,8 @@ short snd_gf1_compute_vibrato(short cents, unsigned short fc_register) 
	};



	long depth;

	short *vi1, *vi2, pcents, v1;

	const short *vi1, *vi2;

	short pcents, v1;



	pcents = cents < 0 ? -cents : cents;

	for (vi1 = vibrato_table, vi2 = vi1 + 2; pcents > *vi2; vi1 = vi2, vi2 += 2);
@@ -145,7 +146,7 @@ short snd_gf1_compute_vibrato(short cents, unsigned short fc_register) 


unsigned short snd_gf1_compute_pitchbend(unsigned short pitchbend, unsigned short sens)

{

	static long log_table[] = {1024, 1085, 1149, 1218, 1290, 1367, 1448, 1534, 1625, 1722, 1825, 1933};

	static const long log_table[] = {1024, 1085, 1149, 1218, 1290, 1367, 1448, 1534, 1625, 1722, 1825, 1933};

	int wheel, sensitivity;

	unsigned int mantissa, f1, f2;

	unsigned short semitones, f1_index, f2_index, f1_power, f2_power;

sound/isa/gus/gusclassic.c

+3 −3
Original line number Diff line number Diff line
@@ -67,9 +67,9 @@ static int snd_gusclassic_create(struct snd_card *card, 
				 struct device *dev, unsigned int n,

				 struct snd_gus_card **rgus)

{

	static long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260};

	static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};

	static int possible_dmas[] = {5, 6, 7, 1, 3, -1};

	static const long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260};

	static const int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};

	static const int possible_dmas[] = {5, 6, 7, 1, 3, -1};



	int i, error;

sound/isa/gus/gusextreme.c

+5 −5
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ static int snd_gusextreme_es1688_create(struct snd_card *card, 
					struct snd_es1688 *chip,

					struct device *dev, unsigned int n)

{

	static long possible_ports[] = {0x220, 0x240, 0x260};

	static int possible_irqs[] = {5, 9, 10, 7, -1};

	static int possible_dmas[] = {1, 3, 0, -1};

	static const long possible_ports[] = {0x220, 0x240, 0x260};

	static const int possible_irqs[] = {5, 9, 10, 7, -1};

	static const int possible_dmas[] = {1, 3, 0, -1};



	int i, error;
@@ -122,8 +122,8 @@ static int snd_gusextreme_gus_card_create(struct snd_card *card, 
					  struct device *dev, unsigned int n,

					  struct snd_gus_card **rgus)

{

	static int possible_irqs[] = {11, 12, 15, 9, 5, 7, 3, -1};

	static int possible_dmas[] = {5, 6, 7, 3, 1, -1};

	static const int possible_irqs[] = {11, 12, 15, 9, 5, 7, 3, -1};

	static const int possible_dmas[] = {5, 6, 7, 3, 1, -1};



	if (gf1_irq[n] == SNDRV_AUTO_IRQ) {

		gf1_irq[n] = snd_legacy_find_free_irq(possible_irqs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE