diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-06-03 02:13:15 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-03 02:13:15 -0400 |
commit | 3e1e0a5dd539f83438078759c8642c5dd7c24cb6 (patch) | |
tree | 3e88a78307f3b57229cbaa17fe388988697ad330 /sound/ppc/tumbler.c | |
parent | 5c9b6e9e618868ac66d92c81b70ad57d82033d4e (diff) |
ALSA: powermac - Replace the rest of __init*
All __initdata should be __devinitdata as platform device is hotpluggable.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/ppc/tumbler.c')
-rw-r--r-- | sound/ppc/tumbler.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index adc8341fe14f..08e584d1453a 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
@@ -838,7 +838,7 @@ static int snapper_put_capture_source(struct snd_kcontrol *kcontrol, | |||
838 | 838 | ||
839 | /* | 839 | /* |
840 | */ | 840 | */ |
841 | static struct snd_kcontrol_new tumbler_mixers[] __initdata = { | 841 | static struct snd_kcontrol_new tumbler_mixers[] __devinitdata = { |
842 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 842 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
843 | .name = "Master Playback Volume", | 843 | .name = "Master Playback Volume", |
844 | .info = tumbler_info_master_volume, | 844 | .info = tumbler_info_master_volume, |
@@ -862,7 +862,7 @@ static struct snd_kcontrol_new tumbler_mixers[] __initdata = { | |||
862 | }, | 862 | }, |
863 | }; | 863 | }; |
864 | 864 | ||
865 | static struct snd_kcontrol_new snapper_mixers[] __initdata = { | 865 | static struct snd_kcontrol_new snapper_mixers[] __devinitdata = { |
866 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 866 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
867 | .name = "Master Playback Volume", | 867 | .name = "Master Playback Volume", |
868 | .info = tumbler_info_master_volume, | 868 | .info = tumbler_info_master_volume, |
@@ -895,7 +895,7 @@ static struct snd_kcontrol_new snapper_mixers[] __initdata = { | |||
895 | }, | 895 | }, |
896 | }; | 896 | }; |
897 | 897 | ||
898 | static struct snd_kcontrol_new tumbler_hp_sw __initdata = { | 898 | static struct snd_kcontrol_new tumbler_hp_sw __devinitdata = { |
899 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 899 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
900 | .name = "Headphone Playback Switch", | 900 | .name = "Headphone Playback Switch", |
901 | .info = snd_pmac_boolean_mono_info, | 901 | .info = snd_pmac_boolean_mono_info, |
@@ -903,7 +903,7 @@ static struct snd_kcontrol_new tumbler_hp_sw __initdata = { | |||
903 | .put = tumbler_put_mute_switch, | 903 | .put = tumbler_put_mute_switch, |
904 | .private_value = TUMBLER_MUTE_HP, | 904 | .private_value = TUMBLER_MUTE_HP, |
905 | }; | 905 | }; |
906 | static struct snd_kcontrol_new tumbler_speaker_sw __initdata = { | 906 | static struct snd_kcontrol_new tumbler_speaker_sw __devinitdata = { |
907 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 907 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
908 | .name = "PC Speaker Playback Switch", | 908 | .name = "PC Speaker Playback Switch", |
909 | .info = snd_pmac_boolean_mono_info, | 909 | .info = snd_pmac_boolean_mono_info, |
@@ -911,7 +911,7 @@ static struct snd_kcontrol_new tumbler_speaker_sw __initdata = { | |||
911 | .put = tumbler_put_mute_switch, | 911 | .put = tumbler_put_mute_switch, |
912 | .private_value = TUMBLER_MUTE_AMP, | 912 | .private_value = TUMBLER_MUTE_AMP, |
913 | }; | 913 | }; |
914 | static struct snd_kcontrol_new tumbler_lineout_sw __initdata = { | 914 | static struct snd_kcontrol_new tumbler_lineout_sw __devinitdata = { |
915 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 915 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
916 | .name = "Line Out Playback Switch", | 916 | .name = "Line Out Playback Switch", |
917 | .info = snd_pmac_boolean_mono_info, | 917 | .info = snd_pmac_boolean_mono_info, |
@@ -919,7 +919,7 @@ static struct snd_kcontrol_new tumbler_lineout_sw __initdata = { | |||
919 | .put = tumbler_put_mute_switch, | 919 | .put = tumbler_put_mute_switch, |
920 | .private_value = TUMBLER_MUTE_LINE, | 920 | .private_value = TUMBLER_MUTE_LINE, |
921 | }; | 921 | }; |
922 | static struct snd_kcontrol_new tumbler_drc_sw __initdata = { | 922 | static struct snd_kcontrol_new tumbler_drc_sw __devinitdata = { |
923 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 923 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
924 | .name = "DRC Switch", | 924 | .name = "DRC Switch", |
925 | .info = snd_pmac_boolean_mono_info, | 925 | .info = snd_pmac_boolean_mono_info, |