aboutsummaryrefslogtreecommitdiffstats
path: root/sound/ppc/tumbler.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-06 12:35:23 -0500
committerTakashi Iwai <tiwai@suse.de>2012-12-07 01:33:30 -0500
commit15afafc2565bc785eb7a440b8b4a53f77910cf04 (patch)
treec5d88e93d33284ef7ac83cf9925886f28829375e /sound/ppc/tumbler.c
parent5cc3203f72d89064da315529103f277124f57005 (diff)
ALSA: ppc: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/ppc/tumbler.c')
-rw-r--r--sound/ppc/tumbler.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 9cea84c3e0c6..b23354a4ceca 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -844,7 +844,7 @@ static int snapper_put_capture_source(struct snd_kcontrol *kcontrol,
844 844
845/* 845/*
846 */ 846 */
847static struct snd_kcontrol_new tumbler_mixers[] __devinitdata = { 847static struct snd_kcontrol_new tumbler_mixers[] = {
848 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 848 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
849 .name = "Master Playback Volume", 849 .name = "Master Playback Volume",
850 .info = tumbler_info_master_volume, 850 .info = tumbler_info_master_volume,
@@ -868,7 +868,7 @@ static struct snd_kcontrol_new tumbler_mixers[] __devinitdata = {
868 }, 868 },
869}; 869};
870 870
871static struct snd_kcontrol_new snapper_mixers[] __devinitdata = { 871static struct snd_kcontrol_new snapper_mixers[] = {
872 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 872 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
873 .name = "Master Playback Volume", 873 .name = "Master Playback Volume",
874 .info = tumbler_info_master_volume, 874 .info = tumbler_info_master_volume,
@@ -901,7 +901,7 @@ static struct snd_kcontrol_new snapper_mixers[] __devinitdata = {
901 }, 901 },
902}; 902};
903 903
904static struct snd_kcontrol_new tumbler_hp_sw __devinitdata = { 904static struct snd_kcontrol_new tumbler_hp_sw = {
905 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 905 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
906 .name = "Headphone Playback Switch", 906 .name = "Headphone Playback Switch",
907 .info = snd_pmac_boolean_mono_info, 907 .info = snd_pmac_boolean_mono_info,
@@ -909,7 +909,7 @@ static struct snd_kcontrol_new tumbler_hp_sw __devinitdata = {
909 .put = tumbler_put_mute_switch, 909 .put = tumbler_put_mute_switch,
910 .private_value = TUMBLER_MUTE_HP, 910 .private_value = TUMBLER_MUTE_HP,
911}; 911};
912static struct snd_kcontrol_new tumbler_speaker_sw __devinitdata = { 912static struct snd_kcontrol_new tumbler_speaker_sw = {
913 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 913 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
914 .name = "Speaker Playback Switch", 914 .name = "Speaker Playback Switch",
915 .info = snd_pmac_boolean_mono_info, 915 .info = snd_pmac_boolean_mono_info,
@@ -917,7 +917,7 @@ static struct snd_kcontrol_new tumbler_speaker_sw __devinitdata = {
917 .put = tumbler_put_mute_switch, 917 .put = tumbler_put_mute_switch,
918 .private_value = TUMBLER_MUTE_AMP, 918 .private_value = TUMBLER_MUTE_AMP,
919}; 919};
920static struct snd_kcontrol_new tumbler_lineout_sw __devinitdata = { 920static struct snd_kcontrol_new tumbler_lineout_sw = {
921 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 921 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
922 .name = "Line Out Playback Switch", 922 .name = "Line Out Playback Switch",
923 .info = snd_pmac_boolean_mono_info, 923 .info = snd_pmac_boolean_mono_info,
@@ -925,7 +925,7 @@ static struct snd_kcontrol_new tumbler_lineout_sw __devinitdata = {
925 .put = tumbler_put_mute_switch, 925 .put = tumbler_put_mute_switch,
926 .private_value = TUMBLER_MUTE_LINE, 926 .private_value = TUMBLER_MUTE_LINE,
927}; 927};
928static struct snd_kcontrol_new tumbler_drc_sw __devinitdata = { 928static struct snd_kcontrol_new tumbler_drc_sw = {
929 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 929 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
930 .name = "DRC Switch", 930 .name = "DRC Switch",
931 .info = snd_pmac_boolean_mono_info, 931 .info = snd_pmac_boolean_mono_info,
@@ -1276,7 +1276,7 @@ static void tumbler_resume(struct snd_pmac *chip)
1276#endif 1276#endif
1277 1277
1278/* initialize tumbler */ 1278/* initialize tumbler */
1279static int __devinit tumbler_init(struct snd_pmac *chip) 1279static int tumbler_init(struct snd_pmac *chip)
1280{ 1280{
1281 int irq; 1281 int irq;
1282 struct pmac_tumbler *mix = chip->mixer_data; 1282 struct pmac_tumbler *mix = chip->mixer_data;
@@ -1349,7 +1349,7 @@ static void tumbler_cleanup(struct snd_pmac *chip)
1349} 1349}
1350 1350
1351/* exported */ 1351/* exported */
1352int __devinit snd_pmac_tumbler_init(struct snd_pmac *chip) 1352int snd_pmac_tumbler_init(struct snd_pmac *chip)
1353{ 1353{
1354 int i, err; 1354 int i, err;
1355 struct pmac_tumbler *mix; 1355 struct pmac_tumbler *mix;