diff options
Diffstat (limited to 'sound/ppc')
-rw-r--r-- | sound/ppc/awacs.c | 54 | ||||
-rw-r--r-- | sound/ppc/beep.c | 2 | ||||
-rw-r--r-- | sound/ppc/burgundy.c | 22 | ||||
-rw-r--r-- | sound/ppc/daca.c | 2 | ||||
-rw-r--r-- | sound/ppc/keywest.c | 4 | ||||
-rw-r--r-- | sound/ppc/pmac.c | 12 | ||||
-rw-r--r-- | sound/ppc/tumbler.c | 16 |
7 files changed, 56 insertions, 56 deletions
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c index 80df9b1f651e..2cc0eda4f20e 100644 --- a/sound/ppc/awacs.c +++ b/sound/ppc/awacs.c | |||
@@ -477,7 +477,7 @@ static int snd_pmac_awacs_put_master_amp(struct snd_kcontrol *kcontrol, | |||
477 | #define AMP_CH_SPK 0 | 477 | #define AMP_CH_SPK 0 |
478 | #define AMP_CH_HD 1 | 478 | #define AMP_CH_HD 1 |
479 | 479 | ||
480 | static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] __initdata = { | 480 | static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] __devinitdata = { |
481 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 481 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
482 | .name = "PC Speaker Playback Volume", | 482 | .name = "PC Speaker Playback Volume", |
483 | .info = snd_pmac_awacs_info_volume_amp, | 483 | .info = snd_pmac_awacs_info_volume_amp, |
@@ -514,7 +514,7 @@ static struct snd_kcontrol_new snd_pmac_awacs_amp_vol[] __initdata = { | |||
514 | }, | 514 | }, |
515 | }; | 515 | }; |
516 | 516 | ||
517 | static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw __initdata = { | 517 | static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw __devinitdata = { |
518 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 518 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
519 | .name = "Headphone Playback Switch", | 519 | .name = "Headphone Playback Switch", |
520 | .info = snd_pmac_boolean_stereo_info, | 520 | .info = snd_pmac_boolean_stereo_info, |
@@ -523,7 +523,7 @@ static struct snd_kcontrol_new snd_pmac_awacs_amp_hp_sw __initdata = { | |||
523 | .private_value = AMP_CH_HD, | 523 | .private_value = AMP_CH_HD, |
524 | }; | 524 | }; |
525 | 525 | ||
526 | static struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw __initdata = { | 526 | static struct snd_kcontrol_new snd_pmac_awacs_amp_spk_sw __devinitdata = { |
527 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 527 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
528 | .name = "PC Speaker Playback Switch", | 528 | .name = "PC Speaker Playback Switch", |
529 | .info = snd_pmac_boolean_stereo_info, | 529 | .info = snd_pmac_boolean_stereo_info, |
@@ -595,46 +595,46 @@ static int snd_pmac_screamer_mic_boost_put(struct snd_kcontrol *kcontrol, | |||
595 | /* | 595 | /* |
596 | * lists of mixer elements | 596 | * lists of mixer elements |
597 | */ | 597 | */ |
598 | static struct snd_kcontrol_new snd_pmac_awacs_mixers[] __initdata = { | 598 | static struct snd_kcontrol_new snd_pmac_awacs_mixers[] __devinitdata = { |
599 | AWACS_SWITCH("Master Capture Switch", 1, SHIFT_LOOPTHRU, 0), | 599 | AWACS_SWITCH("Master Capture Switch", 1, SHIFT_LOOPTHRU, 0), |
600 | AWACS_VOLUME("Master Capture Volume", 0, 4, 0), | 600 | AWACS_VOLUME("Master Capture Volume", 0, 4, 0), |
601 | /* AWACS_SWITCH("Unknown Playback Switch", 6, SHIFT_PAROUT0, 0), */ | 601 | /* AWACS_SWITCH("Unknown Playback Switch", 6, SHIFT_PAROUT0, 0), */ |
602 | }; | 602 | }; |
603 | 603 | ||
604 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_beige[] __initdata = { | 604 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_beige[] __devinitdata = { |
605 | AWACS_VOLUME("Master Playback Volume", 2, 6, 1), | 605 | AWACS_VOLUME("Master Playback Volume", 2, 6, 1), |
606 | AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1), | 606 | AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1), |
607 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), | 607 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), |
608 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_LINE, 0), | 608 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_LINE, 0), |
609 | }; | 609 | }; |
610 | 610 | ||
611 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_lo[] __initdata = { | 611 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_lo[] __devinitdata = { |
612 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), | 612 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), |
613 | }; | 613 | }; |
614 | 614 | ||
615 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] __initdata = { | 615 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] __devinitdata = { |
616 | AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1), | 616 | AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1), |
617 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), | 617 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), |
618 | }; | 618 | }; |
619 | 619 | ||
620 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_g4agp[] __initdata = { | 620 | static struct snd_kcontrol_new snd_pmac_screamer_mixers_g4agp[] __devinitdata = { |
621 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), | 621 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), |
622 | AWACS_VOLUME("Master Playback Volume", 5, 6, 1), | 622 | AWACS_VOLUME("Master Playback Volume", 5, 6, 1), |
623 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), | 623 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), |
624 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), | 624 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), |
625 | }; | 625 | }; |
626 | 626 | ||
627 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] __initdata = { | 627 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] __devinitdata = { |
628 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), | 628 | AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), |
629 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), | 629 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), |
630 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), | 630 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), |
631 | }; | 631 | }; |
632 | 632 | ||
633 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac5500[] __initdata = { | 633 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac5500[] __devinitdata = { |
634 | AWACS_VOLUME("Headphone Playback Volume", 2, 6, 1), | 634 | AWACS_VOLUME("Headphone Playback Volume", 2, 6, 1), |
635 | }; | 635 | }; |
636 | 636 | ||
637 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] __initdata = { | 637 | static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] __devinitdata = { |
638 | AWACS_VOLUME("Master Playback Volume", 2, 6, 1), | 638 | AWACS_VOLUME("Master Playback Volume", 2, 6, 1), |
639 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), | 639 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), |
640 | }; | 640 | }; |
@@ -642,34 +642,34 @@ static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] __initdata = { | |||
642 | /* FIXME: is this correct order? | 642 | /* FIXME: is this correct order? |
643 | * screamer (powerbook G3 pismo) seems to have different bits... | 643 | * screamer (powerbook G3 pismo) seems to have different bits... |
644 | */ | 644 | */ |
645 | static struct snd_kcontrol_new snd_pmac_awacs_mixers2[] __initdata = { | 645 | static struct snd_kcontrol_new snd_pmac_awacs_mixers2[] __devinitdata = { |
646 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_LINE, 0), | 646 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_LINE, 0), |
647 | AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_MIC, 0), | 647 | AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_MIC, 0), |
648 | }; | 648 | }; |
649 | 649 | ||
650 | static struct snd_kcontrol_new snd_pmac_screamer_mixers2[] __initdata = { | 650 | static struct snd_kcontrol_new snd_pmac_screamer_mixers2[] __devinitdata = { |
651 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), | 651 | AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), |
652 | AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_LINE, 0), | 652 | AWACS_SWITCH("Mic Capture Switch", 0, SHIFT_MUX_LINE, 0), |
653 | }; | 653 | }; |
654 | 654 | ||
655 | static struct snd_kcontrol_new snd_pmac_awacs_mixers2_pmac5500[] __initdata = { | 655 | static struct snd_kcontrol_new snd_pmac_awacs_mixers2_pmac5500[] __devinitdata = { |
656 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), | 656 | AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), |
657 | }; | 657 | }; |
658 | 658 | ||
659 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw __initdata = | 659 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw __devinitdata = |
660 | AWACS_SWITCH("Master Playback Switch", 1, SHIFT_HDMUTE, 1); | 660 | AWACS_SWITCH("Master Playback Switch", 1, SHIFT_HDMUTE, 1); |
661 | 661 | ||
662 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw_imac __initdata = | 662 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw_imac __devinitdata = |
663 | AWACS_SWITCH("Line out Playback Switch", 1, SHIFT_HDMUTE, 1); | 663 | AWACS_SWITCH("Line out Playback Switch", 1, SHIFT_HDMUTE, 1); |
664 | 664 | ||
665 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw_pmac5500 __initdata = | 665 | static struct snd_kcontrol_new snd_pmac_awacs_master_sw_pmac5500 __devinitdata = |
666 | AWACS_SWITCH("Headphone Playback Switch", 1, SHIFT_HDMUTE, 1); | 666 | AWACS_SWITCH("Headphone Playback Switch", 1, SHIFT_HDMUTE, 1); |
667 | 667 | ||
668 | static struct snd_kcontrol_new snd_pmac_awacs_mic_boost[] __initdata = { | 668 | static struct snd_kcontrol_new snd_pmac_awacs_mic_boost[] __devinitdata = { |
669 | AWACS_SWITCH("Mic Boost Capture Switch", 0, SHIFT_GAINLINE, 0), | 669 | AWACS_SWITCH("Mic Boost Capture Switch", 0, SHIFT_GAINLINE, 0), |
670 | }; | 670 | }; |
671 | 671 | ||
672 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] __initdata = { | 672 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] __devinitdata = { |
673 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 673 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
674 | .name = "Mic Boost Capture Volume", | 674 | .name = "Mic Boost Capture Volume", |
675 | .info = snd_pmac_screamer_mic_boost_info, | 675 | .info = snd_pmac_screamer_mic_boost_info, |
@@ -678,34 +678,34 @@ static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] __initdata = { | |||
678 | }, | 678 | }, |
679 | }; | 679 | }; |
680 | 680 | ||
681 | static struct snd_kcontrol_new snd_pmac_awacs_mic_boost_pmac7500[] __initdata = | 681 | static struct snd_kcontrol_new snd_pmac_awacs_mic_boost_pmac7500[] __devinitdata = |
682 | { | 682 | { |
683 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), | 683 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), |
684 | }; | 684 | }; |
685 | 685 | ||
686 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_beige[] __initdata = | 686 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_beige[] __devinitdata = |
687 | { | 687 | { |
688 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), | 688 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), |
689 | AWACS_SWITCH("CD Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0), | 689 | AWACS_SWITCH("CD Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0), |
690 | }; | 690 | }; |
691 | 691 | ||
692 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_imac[] __initdata = | 692 | static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_imac[] __devinitdata = |
693 | { | 693 | { |
694 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), | 694 | AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), |
695 | AWACS_SWITCH("Mic Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0), | 695 | AWACS_SWITCH("Mic Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0), |
696 | }; | 696 | }; |
697 | 697 | ||
698 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] __initdata = { | 698 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] __devinitdata = { |
699 | AWACS_VOLUME("PC Speaker Playback Volume", 4, 6, 1), | 699 | AWACS_VOLUME("PC Speaker Playback Volume", 4, 6, 1), |
700 | }; | 700 | }; |
701 | 701 | ||
702 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw __initdata = | 702 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw __devinitdata = |
703 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_SPKMUTE, 1); | 703 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_SPKMUTE, 1); |
704 | 704 | ||
705 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 __initdata = | 705 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac1 __devinitdata = |
706 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 1); | 706 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 1); |
707 | 707 | ||
708 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 __initdata = | 708 | static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac2 __devinitdata = |
709 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 0); | 709 | AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 0); |
710 | 710 | ||
711 | 711 | ||
@@ -872,7 +872,7 @@ static void snd_pmac_awacs_update_automute(struct snd_pmac *chip, int do_notify) | |||
872 | /* | 872 | /* |
873 | * initialize chip | 873 | * initialize chip |
874 | */ | 874 | */ |
875 | int __init | 875 | int __devinit |
876 | snd_pmac_awacs_init(struct snd_pmac *chip) | 876 | snd_pmac_awacs_init(struct snd_pmac *chip) |
877 | { | 877 | { |
878 | int pm7500 = IS_PM7500; | 878 | int pm7500 = IS_PM7500; |
diff --git a/sound/ppc/beep.c b/sound/ppc/beep.c index 89f5c328acfe..a9d350789f55 100644 --- a/sound/ppc/beep.c +++ b/sound/ppc/beep.c | |||
@@ -215,7 +215,7 @@ static struct snd_kcontrol_new snd_pmac_beep_mixer = { | |||
215 | }; | 215 | }; |
216 | 216 | ||
217 | /* Initialize beep stuff */ | 217 | /* Initialize beep stuff */ |
218 | int __init snd_pmac_attach_beep(struct snd_pmac *chip) | 218 | int __devinit snd_pmac_attach_beep(struct snd_pmac *chip) |
219 | { | 219 | { |
220 | struct pmac_beep *beep; | 220 | struct pmac_beep *beep; |
221 | struct input_dev *input_dev; | 221 | struct input_dev *input_dev; |
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c index d2c0a4e987ae..16ed240e423c 100644 --- a/sound/ppc/burgundy.c +++ b/sound/ppc/burgundy.c | |||
@@ -468,7 +468,7 @@ static int snd_pmac_burgundy_put_switch_b(struct snd_kcontrol *kcontrol, | |||
468 | /* | 468 | /* |
469 | * Burgundy mixers | 469 | * Burgundy mixers |
470 | */ | 470 | */ |
471 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __initdata = { | 471 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __devinitdata = { |
472 | BURGUNDY_VOLUME_W("Master Playback Volume", 0, | 472 | BURGUNDY_VOLUME_W("Master Playback Volume", 0, |
473 | MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8), | 473 | MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8), |
474 | BURGUNDY_VOLUME_W("CD Capture Volume", 0, | 474 | BURGUNDY_VOLUME_W("CD Capture Volume", 0, |
@@ -496,7 +496,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __initdata = { | |||
496 | */ BURGUNDY_SWITCH_B("PCM Capture Switch", 0, | 496 | */ BURGUNDY_SWITCH_B("PCM Capture Switch", 0, |
497 | MASK_ADDR_BURGUNDY_HOSTIFEH, 0x01, 0, 0) | 497 | MASK_ADDR_BURGUNDY_HOSTIFEH, 0x01, 0, 0) |
498 | }; | 498 | }; |
499 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __initdata = { | 499 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __devinitdata = { |
500 | BURGUNDY_VOLUME_W("Line in Capture Volume", 0, | 500 | BURGUNDY_VOLUME_W("Line in Capture Volume", 0, |
501 | MASK_ADDR_BURGUNDY_VOLLINE, 16), | 501 | MASK_ADDR_BURGUNDY_VOLLINE, 16), |
502 | BURGUNDY_VOLUME_W("Mic Capture Volume", 0, | 502 | BURGUNDY_VOLUME_W("Mic Capture Volume", 0, |
@@ -522,7 +522,7 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_imac[] __initdata = { | |||
522 | BURGUNDY_SWITCH_B("Mic Boost Capture Switch", 0, | 522 | BURGUNDY_SWITCH_B("Mic Boost Capture Switch", 0, |
523 | MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) | 523 | MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) |
524 | }; | 524 | }; |
525 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __initdata = { | 525 | static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __devinitdata = { |
526 | BURGUNDY_VOLUME_W("Line in Capture Volume", 0, | 526 | BURGUNDY_VOLUME_W("Line in Capture Volume", 0, |
527 | MASK_ADDR_BURGUNDY_VOLMIC, 16), | 527 | MASK_ADDR_BURGUNDY_VOLMIC, 16), |
528 | BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0, | 528 | BURGUNDY_VOLUME_B("Line in Gain Capture Volume", 0, |
@@ -538,33 +538,33 @@ static struct snd_kcontrol_new snd_pmac_burgundy_mixers_pmac[] __initdata = { | |||
538 | /* BURGUNDY_SWITCH_B("Line in Boost Capture Switch", 0, | 538 | /* BURGUNDY_SWITCH_B("Line in Boost Capture Switch", 0, |
539 | * MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) */ | 539 | * MASK_ADDR_BURGUNDY_INPBOOST, 0x40, 0x80, 1) */ |
540 | }; | 540 | }; |
541 | static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac __initdata = | 541 | static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_imac __devinitdata = |
542 | BURGUNDY_SWITCH_B("Master Playback Switch", 0, | 542 | BURGUNDY_SWITCH_B("Master Playback Switch", 0, |
543 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 543 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
544 | BURGUNDY_OUTPUT_LEFT | BURGUNDY_LINEOUT_LEFT | BURGUNDY_HP_LEFT, | 544 | BURGUNDY_OUTPUT_LEFT | BURGUNDY_LINEOUT_LEFT | BURGUNDY_HP_LEFT, |
545 | BURGUNDY_OUTPUT_RIGHT | BURGUNDY_LINEOUT_RIGHT | BURGUNDY_HP_RIGHT, 1); | 545 | BURGUNDY_OUTPUT_RIGHT | BURGUNDY_LINEOUT_RIGHT | BURGUNDY_HP_RIGHT, 1); |
546 | static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac __initdata = | 546 | static struct snd_kcontrol_new snd_pmac_burgundy_master_sw_pmac __devinitdata = |
547 | BURGUNDY_SWITCH_B("Master Playback Switch", 0, | 547 | BURGUNDY_SWITCH_B("Master Playback Switch", 0, |
548 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 548 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
549 | BURGUNDY_OUTPUT_INTERN | 549 | BURGUNDY_OUTPUT_INTERN |
550 | | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); | 550 | | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); |
551 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __initdata = | 551 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_imac __devinitdata = |
552 | BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, | 552 | BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, |
553 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 553 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
554 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); | 554 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); |
555 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __initdata = | 555 | static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw_pmac __devinitdata = |
556 | BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, | 556 | BURGUNDY_SWITCH_B("PC Speaker Playback Switch", 0, |
557 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 557 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
558 | BURGUNDY_OUTPUT_INTERN, 0, 0); | 558 | BURGUNDY_OUTPUT_INTERN, 0, 0); |
559 | static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __initdata = | 559 | static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_imac __devinitdata = |
560 | BURGUNDY_SWITCH_B("Line out Playback Switch", 0, | 560 | BURGUNDY_SWITCH_B("Line out Playback Switch", 0, |
561 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 561 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
562 | BURGUNDY_LINEOUT_LEFT, BURGUNDY_LINEOUT_RIGHT, 1); | 562 | BURGUNDY_LINEOUT_LEFT, BURGUNDY_LINEOUT_RIGHT, 1); |
563 | static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac __initdata = | 563 | static struct snd_kcontrol_new snd_pmac_burgundy_line_sw_pmac __devinitdata = |
564 | BURGUNDY_SWITCH_B("Line out Playback Switch", 0, | 564 | BURGUNDY_SWITCH_B("Line out Playback Switch", 0, |
565 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 565 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
566 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); | 566 | BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); |
567 | static struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac __initdata = | 567 | static struct snd_kcontrol_new snd_pmac_burgundy_hp_sw_imac __devinitdata = |
568 | BURGUNDY_SWITCH_B("Headphone Playback Switch", 0, | 568 | BURGUNDY_SWITCH_B("Headphone Playback Switch", 0, |
569 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, | 569 | MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES, |
570 | BURGUNDY_HP_LEFT, BURGUNDY_HP_RIGHT, 1); | 570 | BURGUNDY_HP_LEFT, BURGUNDY_HP_RIGHT, 1); |
@@ -618,7 +618,7 @@ static void snd_pmac_burgundy_update_automute(struct snd_pmac *chip, int do_noti | |||
618 | /* | 618 | /* |
619 | * initialize burgundy | 619 | * initialize burgundy |
620 | */ | 620 | */ |
621 | int __init snd_pmac_burgundy_init(struct snd_pmac *chip) | 621 | int __devinit snd_pmac_burgundy_init(struct snd_pmac *chip) |
622 | { | 622 | { |
623 | int imac = machine_is_compatible("iMac"); | 623 | int imac = machine_is_compatible("iMac"); |
624 | int i, err; | 624 | int i, err; |
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c index f8d478c2da62..24200b7bdace 100644 --- a/sound/ppc/daca.c +++ b/sound/ppc/daca.c | |||
@@ -244,7 +244,7 @@ static void daca_cleanup(struct snd_pmac *chip) | |||
244 | } | 244 | } |
245 | 245 | ||
246 | /* exported */ | 246 | /* exported */ |
247 | int __init snd_pmac_daca_init(struct snd_pmac *chip) | 247 | int __devinit snd_pmac_daca_init(struct snd_pmac *chip) |
248 | { | 248 | { |
249 | int i, err; | 249 | int i, err; |
250 | struct pmac_daca *mix; | 250 | struct pmac_daca *mix; |
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index b2e2aac22114..835fa19ed461 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c | |||
@@ -105,7 +105,7 @@ void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c) | |||
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||
108 | int __init snd_pmac_tumbler_post_init(void) | 108 | int __devinit snd_pmac_tumbler_post_init(void) |
109 | { | 109 | { |
110 | int err; | 110 | int err; |
111 | 111 | ||
@@ -120,7 +120,7 @@ int __init snd_pmac_tumbler_post_init(void) | |||
120 | } | 120 | } |
121 | 121 | ||
122 | /* exported */ | 122 | /* exported */ |
123 | int __init snd_pmac_keywest_init(struct pmac_keywest *i2c) | 123 | int __devinit snd_pmac_keywest_init(struct pmac_keywest *i2c) |
124 | { | 124 | { |
125 | int err; | 125 | int err; |
126 | 126 | ||
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index 9b4e9c316695..7bc492ee77ec 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c | |||
@@ -702,7 +702,7 @@ static struct snd_pcm_ops snd_pmac_capture_ops = { | |||
702 | .pointer = snd_pmac_capture_pointer, | 702 | .pointer = snd_pmac_capture_pointer, |
703 | }; | 703 | }; |
704 | 704 | ||
705 | int __init snd_pmac_pcm_new(struct snd_pmac *chip) | 705 | int __devinit snd_pmac_pcm_new(struct snd_pmac *chip) |
706 | { | 706 | { |
707 | struct snd_pcm *pcm; | 707 | struct snd_pcm *pcm; |
708 | int err; | 708 | int err; |
@@ -908,7 +908,7 @@ static int snd_pmac_dev_free(struct snd_device *device) | |||
908 | * check the machine support byteswap (little-endian) | 908 | * check the machine support byteswap (little-endian) |
909 | */ | 909 | */ |
910 | 910 | ||
911 | static void __init detect_byte_swap(struct snd_pmac *chip) | 911 | static void __devinit detect_byte_swap(struct snd_pmac *chip) |
912 | { | 912 | { |
913 | struct device_node *mio; | 913 | struct device_node *mio; |
914 | 914 | ||
@@ -934,7 +934,7 @@ static void __init detect_byte_swap(struct snd_pmac *chip) | |||
934 | /* | 934 | /* |
935 | * detect a sound chip | 935 | * detect a sound chip |
936 | */ | 936 | */ |
937 | static int __init snd_pmac_detect(struct snd_pmac *chip) | 937 | static int __devinit snd_pmac_detect(struct snd_pmac *chip) |
938 | { | 938 | { |
939 | struct device_node *sound; | 939 | struct device_node *sound; |
940 | struct device_node *dn; | 940 | struct device_node *dn; |
@@ -1143,7 +1143,7 @@ static int pmac_hp_detect_get(struct snd_kcontrol *kcontrol, | |||
1143 | return 0; | 1143 | return 0; |
1144 | } | 1144 | } |
1145 | 1145 | ||
1146 | static struct snd_kcontrol_new auto_mute_controls[] __initdata = { | 1146 | static struct snd_kcontrol_new auto_mute_controls[] __devinitdata = { |
1147 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 1147 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
1148 | .name = "Auto Mute Switch", | 1148 | .name = "Auto Mute Switch", |
1149 | .info = snd_pmac_boolean_mono_info, | 1149 | .info = snd_pmac_boolean_mono_info, |
@@ -1158,7 +1158,7 @@ static struct snd_kcontrol_new auto_mute_controls[] __initdata = { | |||
1158 | }, | 1158 | }, |
1159 | }; | 1159 | }; |
1160 | 1160 | ||
1161 | int __init snd_pmac_add_automute(struct snd_pmac *chip) | 1161 | int __devinit snd_pmac_add_automute(struct snd_pmac *chip) |
1162 | { | 1162 | { |
1163 | int err; | 1163 | int err; |
1164 | chip->auto_mute = 1; | 1164 | chip->auto_mute = 1; |
@@ -1175,7 +1175,7 @@ int __init snd_pmac_add_automute(struct snd_pmac *chip) | |||
1175 | /* | 1175 | /* |
1176 | * create and detect a pmac chip record | 1176 | * create and detect a pmac chip record |
1177 | */ | 1177 | */ |
1178 | int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) | 1178 | int __devinit snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) |
1179 | { | 1179 | { |
1180 | struct snd_pmac *chip; | 1180 | struct snd_pmac *chip; |
1181 | struct device_node *np; | 1181 | struct device_node *np; |
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 40222fcc0878..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, |
@@ -1269,7 +1269,7 @@ static void tumbler_resume(struct snd_pmac *chip) | |||
1269 | #endif | 1269 | #endif |
1270 | 1270 | ||
1271 | /* initialize tumbler */ | 1271 | /* initialize tumbler */ |
1272 | static int __init tumbler_init(struct snd_pmac *chip) | 1272 | static int __devinit tumbler_init(struct snd_pmac *chip) |
1273 | { | 1273 | { |
1274 | int irq; | 1274 | int irq; |
1275 | struct pmac_tumbler *mix = chip->mixer_data; | 1275 | struct pmac_tumbler *mix = chip->mixer_data; |
@@ -1339,7 +1339,7 @@ static void tumbler_cleanup(struct snd_pmac *chip) | |||
1339 | } | 1339 | } |
1340 | 1340 | ||
1341 | /* exported */ | 1341 | /* exported */ |
1342 | int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | 1342 | int __devinit snd_pmac_tumbler_init(struct snd_pmac *chip) |
1343 | { | 1343 | { |
1344 | int i, err; | 1344 | int i, err; |
1345 | struct pmac_tumbler *mix; | 1345 | struct pmac_tumbler *mix; |