diff options
author | Mathias Krause <minipli@googlemail.com> | 2014-07-16 13:43:17 -0400 |
---|---|---|
committer | Matthew Garrett <matthew.garrett@nebula.com> | 2014-08-16 04:23:53 -0400 |
commit | c3aa47239d9877a938ed59d3acae01f84ae6c943 (patch) | |
tree | db36d97cd6837c1c6d32e04be23ebf7375d870a4 | |
parent | fbe9b79f8c574de1dfbd9eb933f4065af8738357 (diff) |
thinkpad_acpi: Mark volume_alsa_control_{vol,mute} as __initdata
Mark volume_alsa_control_vol and volume_alsa_control_mute as __initdata,
as snd_ctl_new1() will copy the relevant parts, so there is no need to
keep the master copies around after initialization.
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
-rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 61e8ff020256..3bbc6eb60de5 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
@@ -6860,7 +6860,7 @@ static int volume_alsa_mute_put(struct snd_kcontrol *kcontrol, | |||
6860 | return volume_alsa_set_mute(!ucontrol->value.integer.value[0]); | 6860 | return volume_alsa_set_mute(!ucontrol->value.integer.value[0]); |
6861 | } | 6861 | } |
6862 | 6862 | ||
6863 | static struct snd_kcontrol_new volume_alsa_control_vol = { | 6863 | static struct snd_kcontrol_new volume_alsa_control_vol __initdata = { |
6864 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 6864 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
6865 | .name = "Console Playback Volume", | 6865 | .name = "Console Playback Volume", |
6866 | .index = 0, | 6866 | .index = 0, |
@@ -6869,7 +6869,7 @@ static struct snd_kcontrol_new volume_alsa_control_vol = { | |||
6869 | .get = volume_alsa_vol_get, | 6869 | .get = volume_alsa_vol_get, |
6870 | }; | 6870 | }; |
6871 | 6871 | ||
6872 | static struct snd_kcontrol_new volume_alsa_control_mute = { | 6872 | static struct snd_kcontrol_new volume_alsa_control_mute __initdata = { |
6873 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 6873 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
6874 | .name = "Console Playback Switch", | 6874 | .name = "Console Playback Switch", |
6875 | .index = 0, | 6875 | .index = 0, |