From: Mathias Krause Date: Wed, 16 Jul 2014 17:43:17 +0000 (+0200) Subject: thinkpad_acpi: Mark volume_alsa_control_{vol,mute} as __initdata X-Git-Tag: for-3.18~1^2~14 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=c3aa47239d9877a938ed59d3acae01f84ae6c943;p=jlayton%2Flinux.git 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 Cc: Henrique de Moraes Holschuh Signed-off-by: Matthew Garrett --- 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, return volume_alsa_set_mute(!ucontrol->value.integer.value[0]); } -static struct snd_kcontrol_new volume_alsa_control_vol = { +static struct snd_kcontrol_new volume_alsa_control_vol __initdata = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Console Playback Volume", .index = 0, @@ -6869,7 +6869,7 @@ static struct snd_kcontrol_new volume_alsa_control_vol = { .get = volume_alsa_vol_get, }; -static struct snd_kcontrol_new volume_alsa_control_mute = { +static struct snd_kcontrol_new volume_alsa_control_mute __initdata = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Console Playback Switch", .index = 0,