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

ALSA: riptide: More constifications 

Apply const prefix to each lbus path table definition and its
callers.

Just for minor optimization and no functional changes.

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


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

sound/pci/riptide/riptide.c

+30 −30
Original line number Diff line number Diff line
@@ -361,9 +361,9 @@ enum RT_CHANNEL_IDS { 
enum { SB_CMD = 0, MODEM_CMD, I2S_CMD0, I2S_CMD1, FM_CMD, MAX_CMD };



struct lbuspath {

	unsigned char *noconv;

	unsigned char *stereo;

	unsigned char *mono;

	const unsigned char *noconv;

	const unsigned char *stereo;

	const unsigned char *mono;

};



struct cmdport {
@@ -464,7 +464,7 @@ struct sgd { /* scatter gather desriptor */ 


struct pcmhw {			/* pcm descriptor */

	struct lbuspath paths;

	unsigned char *lbuspath;

	const unsigned char *lbuspath;

	unsigned char source;

	unsigned char intdec[2];

	unsigned char mixer;
@@ -517,7 +517,7 @@ MODULE_DEVICE_TABLE(pci, snd_riptide_ids); 
/*

 */



static unsigned char lbusin2out[E2SINK_MAX + 1][2] = {

static const unsigned char lbusin2out[E2SINK_MAX + 1][2] = {

	{NO_OUT, LS_NONE1}, {NO_OUT, LS_NONE2}, {NO_OUT, LS_NONE1}, {NO_OUT,

								     LS_NONE2},

	{NO_OUT, LS_NONE1}, {NO_OUT, LS_NONE2}, {NO_OUT, LS_NONE1}, {NO_OUT,
@@ -557,63 +557,63 @@ static unsigned char lbusin2out[E2SINK_MAX + 1][2] = { 
								     LS_NONE2},

};



static unsigned char lbus_play_opl3[] = {

static const unsigned char lbus_play_opl3[] = {

	DIGITAL_MIXER_IN0 + FM_MIXER, 0xff

};

static unsigned char lbus_play_modem[] = {

static const unsigned char lbus_play_modem[] = {

	DIGITAL_MIXER_IN0 + MODEM_MIXER, 0xff

};

static unsigned char lbus_play_i2s[] = {

static const unsigned char lbus_play_i2s[] = {

	INTER0_IN + I2S_INTDEC, DIGITAL_MIXER_IN0 + I2S_MIXER, 0xff

};

static unsigned char lbus_play_out[] = {

static const unsigned char lbus_play_out[] = {

	PDAC2ACLNK, 0xff

};

static unsigned char lbus_play_outhp[] = {

static const unsigned char lbus_play_outhp[] = {

	HNDSPK2ACLNK, 0xff

};

static unsigned char lbus_play_noconv1[] = {

static const unsigned char lbus_play_noconv1[] = {

	DIGITAL_MIXER_IN0, 0xff

};

static unsigned char lbus_play_stereo1[] = {

static const unsigned char lbus_play_stereo1[] = {

	INTER0_IN, DIGITAL_MIXER_IN0, 0xff

};

static unsigned char lbus_play_mono1[] = {

static const unsigned char lbus_play_mono1[] = {

	INTERM0_IN, DIGITAL_MIXER_IN0, 0xff

};

static unsigned char lbus_play_noconv2[] = {

static const unsigned char lbus_play_noconv2[] = {

	DIGITAL_MIXER_IN1, 0xff

};

static unsigned char lbus_play_stereo2[] = {

static const unsigned char lbus_play_stereo2[] = {

	INTER1_IN, DIGITAL_MIXER_IN1, 0xff

};

static unsigned char lbus_play_mono2[] = {

static const unsigned char lbus_play_mono2[] = {

	INTERM1_IN, DIGITAL_MIXER_IN1, 0xff

};

static unsigned char lbus_play_noconv3[] = {

static const unsigned char lbus_play_noconv3[] = {

	DIGITAL_MIXER_IN2, 0xff

};

static unsigned char lbus_play_stereo3[] = {

static const unsigned char lbus_play_stereo3[] = {

	INTER2_IN, DIGITAL_MIXER_IN2, 0xff

};

static unsigned char lbus_play_mono3[] = {

static const unsigned char lbus_play_mono3[] = {

	INTERM2_IN, DIGITAL_MIXER_IN2, 0xff

};

static unsigned char lbus_rec_noconv1[] = {

static const unsigned char lbus_rec_noconv1[] = {

	LBUS2ARM_FIFO5, 0xff

};

static unsigned char lbus_rec_stereo1[] = {

static const unsigned char lbus_rec_stereo1[] = {

	DECIM0_IN, LBUS2ARM_FIFO5, 0xff

};

static unsigned char lbus_rec_mono1[] = {

static const unsigned char lbus_rec_mono1[] = {

	DECIMM3_IN, LBUS2ARM_FIFO5, 0xff

};



static unsigned char play_ids[] = { 4, 1, 2, };

static unsigned char play_sources[] = {

static const unsigned char play_ids[] = { 4, 1, 2, };

static const unsigned char play_sources[] = {

	ARM2LBUS_FIFO4, ARM2LBUS_FIFO1, ARM2LBUS_FIFO2,

};

static struct lbuspath lbus_play_paths[] = {

static const struct lbuspath lbus_play_paths[] = {

	{

	 .noconv = lbus_play_noconv1,

	 .stereo = lbus_play_stereo1,
@@ -737,7 +737,7 @@ static int loadfirmware(struct cmdif *cif, const unsigned char *img, 


static void

alloclbuspath(struct cmdif *cif, unsigned char source,

	      unsigned char *path, unsigned char *mixer, unsigned char *s)

	      const unsigned char *path, unsigned char *mixer, unsigned char *s)

{

	while (*path != 0xff) {

		unsigned char sink, type;
@@ -765,7 +765,7 @@ alloclbuspath(struct cmdif *cif, unsigned char source, 
			}

		}

		if (*path++ & SPLIT_PATH) {

			unsigned char *npath = path;

			const unsigned char *npath = path;



			while (*npath != 0xff)

				npath++;
@@ -775,7 +775,7 @@ alloclbuspath(struct cmdif *cif, unsigned char source, 
}



static void

freelbuspath(struct cmdif *cif, unsigned char source, unsigned char *path)

freelbuspath(struct cmdif *cif, unsigned char source, const unsigned char *path)

{

	while (*path != 0xff) {

		unsigned char sink;
@@ -787,7 +787,7 @@ freelbuspath(struct cmdif *cif, unsigned char source, unsigned char *path) 
			source = lbusin2out[sink][0];

		}

		if (*path++ & SPLIT_PATH) {

			unsigned char *npath = path;

			const unsigned char *npath = path;



			while (*npath != 0xff)

				npath++;
@@ -1441,7 +1441,7 @@ static int snd_riptide_prepare(struct snd_pcm_substream *substream) 
	struct snd_pcm_runtime *runtime = substream->runtime;

	struct pcmhw *data = get_pcmhwdev(substream);

	struct cmdif *cif = chip->cif;

	unsigned char *lbuspath = NULL;

	const unsigned char *lbuspath = NULL;

	unsigned int rate, channels;

	int err = 0;

	snd_pcm_format_t format;