Commit 56d7058e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: caiaq: More constifications 

Apply const prefix to each possible place: the rate table, the
controller tables, and the key tables.

Just for minor optimization and no functional changes.

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


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

sound/usb/caiaq/audio.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int snd_usb_caiaq_pcm_hw_free(struct snd_pcm_substream *sub) 
#error "Change this table"

#endif



static unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100,

static const unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100,

				48000, 64000, 88200, 96000, 176400, 192000 };



static int snd_usb_caiaq_pcm_prepare(struct snd_pcm_substream *substream)

sound/usb/caiaq/control.c

+10 −10
Original line number Diff line number Diff line
@@ -163,14 +163,14 @@ struct caiaq_controller { 
	int index;

};



static struct caiaq_controller ak1_controller[] = {

static const struct caiaq_controller ak1_controller[] = {

	{ "LED left", 	2 },

	{ "LED middle", 1 },

	{ "LED right", 	0 },

	{ "LED ring", 	3 }

};



static struct caiaq_controller rk2_controller[] = {

static const struct caiaq_controller rk2_controller[] = {

	{ "LED 1",		5  },

	{ "LED 2",		4  },

	{ "LED 3",		3  },
@@ -196,7 +196,7 @@ static struct caiaq_controller rk2_controller[] = { 
	{ "LED 7seg_3g",	23 }

};



static struct caiaq_controller rk3_controller[] = {

static const struct caiaq_controller rk3_controller[] = {

	{ "LED 7seg_1a",        0 + 0 },

	{ "LED 7seg_1b",        0 + 1 },

	{ "LED 7seg_1c",        0 + 2 },
@@ -244,7 +244,7 @@ static struct caiaq_controller rk3_controller[] = { 
	{ "LED pedal",		32 + 8 }

};



static struct caiaq_controller kore_controller[] = {

static const struct caiaq_controller kore_controller[] = {

	{ "LED F1",		8   | CNT_INTVAL },

	{ "LED F2",		12  | CNT_INTVAL },

	{ "LED F3",		0   | CNT_INTVAL },
@@ -278,7 +278,7 @@ static struct caiaq_controller kore_controller[] = { 
	{ "LED control",	26  | CNT_INTVAL }

};



static struct caiaq_controller a8dj_controller[] = {

static const struct caiaq_controller a8dj_controller[] = {

	{ "Current input mode",			0 | CNT_INTVAL 	},

	{ "GND lift for TC Vinyl mode", 	24 + 0 		},

	{ "GND lift for TC CD/Line mode", 	24 + 1 		},
@@ -286,11 +286,11 @@ static struct caiaq_controller a8dj_controller[] = { 
	{ "Software lock", 			40 		}

};



static struct caiaq_controller a4dj_controller[] = {

static const struct caiaq_controller a4dj_controller[] = {

	{ "Current input mode",	0 | CNT_INTVAL 	}

};



static struct caiaq_controller kontrolx1_controller[] = {

static const struct caiaq_controller kontrolx1_controller[] = {

	{ "LED FX A: ON",		7 | CNT_INTVAL	},

	{ "LED FX A: 1",		6 | CNT_INTVAL	},

	{ "LED FX A: 2",		5 | CNT_INTVAL	},
@@ -327,7 +327,7 @@ static struct caiaq_controller kontrolx1_controller[] = { 
	{ "LED Deck B: SYNC",		8  | CNT_INTVAL	},

};



static struct caiaq_controller kontrols4_controller[] = {

static const struct caiaq_controller kontrols4_controller[] = {

	{ "LED: Master: Quant",			10  | CNT_INTVAL },

	{ "LED: Master: Headphone",		11  | CNT_INTVAL },

	{ "LED: Master: Master",		12  | CNT_INTVAL },
@@ -500,7 +500,7 @@ static struct caiaq_controller kontrols4_controller[] = { 
	{ "LED: FX2: Mode",			133 | CNT_INTVAL },

};



static struct caiaq_controller maschine_controller[] = {

static const struct caiaq_controller maschine_controller[] = {

	{ "LED: Pad 1",				3  | CNT_INTVAL },

	{ "LED: Pad 2",				2  | CNT_INTVAL },

	{ "LED: Pad 3",				1  | CNT_INTVAL },
@@ -568,7 +568,7 @@ static struct caiaq_controller maschine_controller[] = { 
	{ "Backlight Display",			59 | CNT_INTVAL }

};



static int add_controls(struct caiaq_controller *c, int num,

static int add_controls(const struct caiaq_controller *c, int num,

			struct snd_usb_caiaqdev *cdev)

{

	int i, ret;

sound/usb/caiaq/input.c

+5 −5
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ 
#include "device.h"

#include "input.h"



static unsigned short keycode_ak1[] =  { KEY_C, KEY_B, KEY_A };

static unsigned short keycode_rk2[] =  { KEY_1, KEY_2, KEY_3, KEY_4,

static const unsigned short keycode_ak1[] =  { KEY_C, KEY_B, KEY_A };

static const unsigned short keycode_rk2[] =  { KEY_1, KEY_2, KEY_3, KEY_4,

					 KEY_5, KEY_6, KEY_7 };

static unsigned short keycode_rk3[] =  { KEY_1, KEY_2, KEY_3, KEY_4,

static const unsigned short keycode_rk3[] =  { KEY_1, KEY_2, KEY_3, KEY_4,

					 KEY_5, KEY_6, KEY_7, KEY_8, KEY_9 };



static unsigned short keycode_kore[] = {

static const unsigned short keycode_kore[] = {

	KEY_FN_F1,      /* "menu"               */

	KEY_FN_F7,      /* "lcd backlight       */

	KEY_FN_F2,      /* "control"            */
@@ -60,7 +60,7 @@ static unsigned short keycode_kore[] = { 
#define MASCHINE_PADS      (16)

#define MASCHINE_PAD(X)    ((X) + ABS_PRESSURE)



static unsigned short keycode_maschine[] = {

static const unsigned short keycode_maschine[] = {

	MASCHINE_BUTTON(40), /* mute       */

	MASCHINE_BUTTON(39), /* solo       */

	MASCHINE_BUTTON(38), /* select     */