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/burgundy.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/burgundy.c')
-rw-r--r-- | sound/ppc/burgundy.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c index aba38143a8ab..bb80770890c7 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); |