diff options
Diffstat (limited to 'sound/pci/ice1712/delta.c')
-rw-r--r-- | sound/pci/ice1712/delta.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c index bbef99bf77df..ab2bca164d6f 100644 --- a/sound/pci/ice1712/delta.c +++ b/sound/pci/ice1712/delta.c | |||
@@ -431,7 +431,7 @@ static int snd_ice1712_delta1010lt_wordclock_status_get(struct snd_kcontrol *kco | |||
431 | return 0; | 431 | return 0; |
432 | } | 432 | } |
433 | 433 | ||
434 | static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devinitdata = | 434 | static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status = |
435 | { | 435 | { |
436 | .access = (SNDRV_CTL_ELEM_ACCESS_READ), | 436 | .access = (SNDRV_CTL_ELEM_ACCESS_READ), |
437 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 437 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
@@ -444,7 +444,7 @@ static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status __devini | |||
444 | * initialize the chips on M-Audio cards | 444 | * initialize the chips on M-Audio cards |
445 | */ | 445 | */ |
446 | 446 | ||
447 | static struct snd_akm4xxx akm_audiophile __devinitdata = { | 447 | static struct snd_akm4xxx akm_audiophile = { |
448 | .type = SND_AK4528, | 448 | .type = SND_AK4528, |
449 | .num_adcs = 2, | 449 | .num_adcs = 2, |
450 | .num_dacs = 2, | 450 | .num_dacs = 2, |
@@ -453,7 +453,7 @@ static struct snd_akm4xxx akm_audiophile __devinitdata = { | |||
453 | } | 453 | } |
454 | }; | 454 | }; |
455 | 455 | ||
456 | static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = { | 456 | static struct snd_ak4xxx_private akm_audiophile_priv = { |
457 | .caddr = 2, | 457 | .caddr = 2, |
458 | .cif = 0, | 458 | .cif = 0, |
459 | .data_mask = ICE1712_DELTA_AP_DOUT, | 459 | .data_mask = ICE1712_DELTA_AP_DOUT, |
@@ -465,7 +465,7 @@ static struct snd_ak4xxx_private akm_audiophile_priv __devinitdata = { | |||
465 | .mask_flags = 0, | 465 | .mask_flags = 0, |
466 | }; | 466 | }; |
467 | 467 | ||
468 | static struct snd_akm4xxx akm_delta410 __devinitdata = { | 468 | static struct snd_akm4xxx akm_delta410 = { |
469 | .type = SND_AK4529, | 469 | .type = SND_AK4529, |
470 | .num_adcs = 2, | 470 | .num_adcs = 2, |
471 | .num_dacs = 8, | 471 | .num_dacs = 8, |
@@ -474,7 +474,7 @@ static struct snd_akm4xxx akm_delta410 __devinitdata = { | |||
474 | } | 474 | } |
475 | }; | 475 | }; |
476 | 476 | ||
477 | static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = { | 477 | static struct snd_ak4xxx_private akm_delta410_priv = { |
478 | .caddr = 0, | 478 | .caddr = 0, |
479 | .cif = 0, | 479 | .cif = 0, |
480 | .data_mask = ICE1712_DELTA_AP_DOUT, | 480 | .data_mask = ICE1712_DELTA_AP_DOUT, |
@@ -486,7 +486,7 @@ static struct snd_ak4xxx_private akm_delta410_priv __devinitdata = { | |||
486 | .mask_flags = 0, | 486 | .mask_flags = 0, |
487 | }; | 487 | }; |
488 | 488 | ||
489 | static struct snd_akm4xxx akm_delta1010lt __devinitdata = { | 489 | static struct snd_akm4xxx akm_delta1010lt = { |
490 | .type = SND_AK4524, | 490 | .type = SND_AK4524, |
491 | .num_adcs = 8, | 491 | .num_adcs = 8, |
492 | .num_dacs = 8, | 492 | .num_dacs = 8, |
@@ -496,7 +496,7 @@ static struct snd_akm4xxx akm_delta1010lt __devinitdata = { | |||
496 | } | 496 | } |
497 | }; | 497 | }; |
498 | 498 | ||
499 | static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = { | 499 | static struct snd_ak4xxx_private akm_delta1010lt_priv = { |
500 | .caddr = 2, | 500 | .caddr = 2, |
501 | .cif = 0, /* the default level of the CIF pin from AK4524 */ | 501 | .cif = 0, /* the default level of the CIF pin from AK4524 */ |
502 | .data_mask = ICE1712_DELTA_1010LT_DOUT, | 502 | .data_mask = ICE1712_DELTA_1010LT_DOUT, |
@@ -508,7 +508,7 @@ static struct snd_ak4xxx_private akm_delta1010lt_priv __devinitdata = { | |||
508 | .mask_flags = 0, | 508 | .mask_flags = 0, |
509 | }; | 509 | }; |
510 | 510 | ||
511 | static struct snd_akm4xxx akm_delta66e __devinitdata = { | 511 | static struct snd_akm4xxx akm_delta66e = { |
512 | .type = SND_AK4524, | 512 | .type = SND_AK4524, |
513 | .num_adcs = 4, | 513 | .num_adcs = 4, |
514 | .num_dacs = 4, | 514 | .num_dacs = 4, |
@@ -518,7 +518,7 @@ static struct snd_akm4xxx akm_delta66e __devinitdata = { | |||
518 | } | 518 | } |
519 | }; | 519 | }; |
520 | 520 | ||
521 | static struct snd_ak4xxx_private akm_delta66e_priv __devinitdata = { | 521 | static struct snd_ak4xxx_private akm_delta66e_priv = { |
522 | .caddr = 2, | 522 | .caddr = 2, |
523 | .cif = 0, /* the default level of the CIF pin from AK4524 */ | 523 | .cif = 0, /* the default level of the CIF pin from AK4524 */ |
524 | .data_mask = ICE1712_DELTA_66E_DOUT, | 524 | .data_mask = ICE1712_DELTA_66E_DOUT, |
@@ -531,7 +531,7 @@ static struct snd_ak4xxx_private akm_delta66e_priv __devinitdata = { | |||
531 | }; | 531 | }; |
532 | 532 | ||
533 | 533 | ||
534 | static struct snd_akm4xxx akm_delta44 __devinitdata = { | 534 | static struct snd_akm4xxx akm_delta44 = { |
535 | .type = SND_AK4524, | 535 | .type = SND_AK4524, |
536 | .num_adcs = 4, | 536 | .num_adcs = 4, |
537 | .num_dacs = 4, | 537 | .num_dacs = 4, |
@@ -541,7 +541,7 @@ static struct snd_akm4xxx akm_delta44 __devinitdata = { | |||
541 | } | 541 | } |
542 | }; | 542 | }; |
543 | 543 | ||
544 | static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = { | 544 | static struct snd_ak4xxx_private akm_delta44_priv = { |
545 | .caddr = 2, | 545 | .caddr = 2, |
546 | .cif = 0, /* the default level of the CIF pin from AK4524 */ | 546 | .cif = 0, /* the default level of the CIF pin from AK4524 */ |
547 | .data_mask = ICE1712_DELTA_CODEC_SERIAL_DATA, | 547 | .data_mask = ICE1712_DELTA_CODEC_SERIAL_DATA, |
@@ -553,7 +553,7 @@ static struct snd_ak4xxx_private akm_delta44_priv __devinitdata = { | |||
553 | .mask_flags = 0, | 553 | .mask_flags = 0, |
554 | }; | 554 | }; |
555 | 555 | ||
556 | static struct snd_akm4xxx akm_vx442 __devinitdata = { | 556 | static struct snd_akm4xxx akm_vx442 = { |
557 | .type = SND_AK4524, | 557 | .type = SND_AK4524, |
558 | .num_adcs = 4, | 558 | .num_adcs = 4, |
559 | .num_dacs = 4, | 559 | .num_dacs = 4, |
@@ -563,7 +563,7 @@ static struct snd_akm4xxx akm_vx442 __devinitdata = { | |||
563 | } | 563 | } |
564 | }; | 564 | }; |
565 | 565 | ||
566 | static struct snd_ak4xxx_private akm_vx442_priv __devinitdata = { | 566 | static struct snd_ak4xxx_private akm_vx442_priv = { |
567 | .caddr = 2, | 567 | .caddr = 2, |
568 | .cif = 0, | 568 | .cif = 0, |
569 | .data_mask = ICE1712_VX442_DOUT, | 569 | .data_mask = ICE1712_VX442_DOUT, |
@@ -575,7 +575,7 @@ static struct snd_ak4xxx_private akm_vx442_priv __devinitdata = { | |||
575 | .mask_flags = 0, | 575 | .mask_flags = 0, |
576 | }; | 576 | }; |
577 | 577 | ||
578 | static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice) | 578 | static int snd_ice1712_delta_init(struct snd_ice1712 *ice) |
579 | { | 579 | { |
580 | int err; | 580 | int err; |
581 | struct snd_akm4xxx *ak; | 581 | struct snd_akm4xxx *ak; |
@@ -713,19 +713,19 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice) | |||
713 | * additional controls for M-Audio cards | 713 | * additional controls for M-Audio cards |
714 | */ | 714 | */ |
715 | 715 | ||
716 | static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select __devinitdata = | 716 | static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_select = |
717 | ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 1, 0); | 717 | ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_WORD_CLOCK_SELECT, 1, 0); |
718 | static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select __devinitdata = | 718 | static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_select = |
719 | ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_1010LT_WORDCLOCK, 0, 0); | 719 | ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Sync", 0, ICE1712_DELTA_1010LT_WORDCLOCK, 0, 0); |
720 | static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status __devinitdata = | 720 | static struct snd_kcontrol_new snd_ice1712_delta1010_wordclock_status = |
721 | ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Status", 0, ICE1712_DELTA_WORD_CLOCK_STATUS, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE); | 721 | ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Word Clock Status", 0, ICE1712_DELTA_WORD_CLOCK_STATUS, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE); |
722 | static struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select __devinitdata = | 722 | static struct snd_kcontrol_new snd_ice1712_deltadio2496_spdif_in_select = |
723 | ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0, 0); | 723 | ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "IEC958 Input Optical", 0, ICE1712_DELTA_SPDIF_INPUT_SELECT, 0, 0); |
724 | static struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status __devinitdata = | 724 | static struct snd_kcontrol_new snd_ice1712_delta_spdif_in_status = |
725 | ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Delta IEC958 Input Status", 0, ICE1712_DELTA_SPDIF_IN_STAT, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE); | 725 | ICE1712_GPIO(SNDRV_CTL_ELEM_IFACE_MIXER, "Delta IEC958 Input Status", 0, ICE1712_DELTA_SPDIF_IN_STAT, 1, SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE); |
726 | 726 | ||
727 | 727 | ||
728 | static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice) | 728 | static int snd_ice1712_delta_add_controls(struct snd_ice1712 *ice) |
729 | { | 729 | { |
730 | int err; | 730 | int err; |
731 | 731 | ||
@@ -801,7 +801,7 @@ static int __devinit snd_ice1712_delta_add_controls(struct snd_ice1712 *ice) | |||
801 | 801 | ||
802 | 802 | ||
803 | /* entry point */ | 803 | /* entry point */ |
804 | struct snd_ice1712_card_info snd_ice1712_delta_cards[] __devinitdata = { | 804 | struct snd_ice1712_card_info snd_ice1712_delta_cards[] = { |
805 | { | 805 | { |
806 | .subvendor = ICE1712_SUBDEVICE_DELTA1010, | 806 | .subvendor = ICE1712_SUBDEVICE_DELTA1010, |
807 | .name = "M Audio Delta 1010", | 807 | .name = "M Audio Delta 1010", |