Skip to content

Commit

Permalink
ALSA: usb-audio: constify snd_kcontrol_new structures
Browse files Browse the repository at this point in the history 
Declare snd_kcontrol_new structures as const as they are only passed as
an argument to the function add_new_ctl. This agrument is of type const,
so snd_kcontrol_new structures having this property can be made const
too.

Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Bhumika Goyal authored and Takashi Iwai committed Feb 21, 2017
1 parent f3b827e commit 04bab35
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions sound/usb/mixer_scarlett.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ static int scarlett_ctl_meter_get(struct snd_kcontrol *kctl,
return 0;
}

static struct snd_kcontrol_new usb_scarlett_ctl_switch = {
static const struct snd_kcontrol_new usb_scarlett_ctl_switch = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "",
.info = scarlett_ctl_switch_info,
Expand All @@ -487,7 +487,7 @@ static struct snd_kcontrol_new usb_scarlett_ctl_switch = {

static const DECLARE_TLV_DB_SCALE(db_scale_scarlett_gain, -12800, 100, 0);

static struct snd_kcontrol_new usb_scarlett_ctl = {
static const struct snd_kcontrol_new usb_scarlett_ctl = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ,
Expand All @@ -499,7 +499,7 @@ static struct snd_kcontrol_new usb_scarlett_ctl = {
.tlv = { .p = db_scale_scarlett_gain }
};

static struct snd_kcontrol_new usb_scarlett_ctl_master = {
static const struct snd_kcontrol_new usb_scarlett_ctl_master = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
SNDRV_CTL_ELEM_ACCESS_TLV_READ,
Expand All @@ -511,23 +511,23 @@ static struct snd_kcontrol_new usb_scarlett_ctl_master = {
.tlv = { .p = db_scale_scarlett_gain }
};

static struct snd_kcontrol_new usb_scarlett_ctl_enum = {
static const struct snd_kcontrol_new usb_scarlett_ctl_enum = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "",
.info = scarlett_ctl_enum_info,
.get = scarlett_ctl_enum_get,
.put = scarlett_ctl_enum_put,
};

static struct snd_kcontrol_new usb_scarlett_ctl_dynamic_enum = {
static const struct snd_kcontrol_new usb_scarlett_ctl_dynamic_enum = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "",
.info = scarlett_ctl_enum_dynamic_info,
.get = scarlett_ctl_enum_get,
.put = scarlett_ctl_enum_put,
};

static struct snd_kcontrol_new usb_scarlett_ctl_sync = {
static const struct snd_kcontrol_new usb_scarlett_ctl_sync = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
.name = "",
Expand Down

0 comments on commit 04bab35

Please sign in to comment.