aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/dmasound/dmasound_awacs.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss/dmasound/dmasound_awacs.c')
-rw-r--r--sound/oss/dmasound/dmasound_awacs.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index f8a49bd17a13..7aa4d43ae6cd 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -578,7 +578,7 @@ tas_mixer_ioctl(u_int cmd, u_long arg)
578} 578}
579 579
580static void __init 580static void __init
581tas_init_frame_rates(unsigned int *prop, unsigned int l) 581tas_init_frame_rates(const unsigned int *prop, unsigned int l)
582{ 582{
583 int i ; 583 int i ;
584 if (prop) { 584 if (prop) {
@@ -2651,7 +2651,7 @@ get_expansion_type(void)
2651*/ 2651*/
2652 2652
2653static void __init 2653static void __init
2654awacs_init_frame_rates(unsigned int *prop, unsigned int l) 2654awacs_init_frame_rates(const unsigned int *prop, unsigned int l)
2655{ 2655{
2656 int i ; 2656 int i ;
2657 if (prop) { 2657 if (prop) {
@@ -2674,7 +2674,7 @@ awacs_init_frame_rates(unsigned int *prop, unsigned int l)
2674} 2674}
2675 2675
2676static void __init 2676static void __init
2677burgundy_init_frame_rates(unsigned int *prop, unsigned int l) 2677burgundy_init_frame_rates(const unsigned int *prop, unsigned int l)
2678{ 2678{
2679 int temp[9] ; 2679 int temp[9] ;
2680 int i = 0 ; 2680 int i = 0 ;
@@ -2700,7 +2700,7 @@ if (i > 1){
2700} 2700}
2701 2701
2702static void __init 2702static void __init
2703daca_init_frame_rates(unsigned int *prop, unsigned int l) 2703daca_init_frame_rates(const unsigned int *prop, unsigned int l)
2704{ 2704{
2705 int temp[9] ; 2705 int temp[9] ;
2706 int i = 0 ; 2706 int i = 0 ;
@@ -2727,7 +2727,7 @@ if (i > 1){
2727} 2727}
2728 2728
2729static void __init 2729static void __init
2730init_frame_rates(unsigned int *prop, unsigned int l) 2730init_frame_rates(const unsigned int *prop, unsigned int l)
2731{ 2731{
2732 switch (awacs_revision) { 2732 switch (awacs_revision) {
2733 case AWACS_TUMBLER: 2733 case AWACS_TUMBLER:
@@ -2972,21 +2972,21 @@ printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev);
2972 */ 2972 */
2973 2973
2974 if (info) { 2974 if (info) {
2975 unsigned int *prop, l; 2975 const unsigned int *prop;
2976 unsigned int l;
2976 2977
2977 sound_device_id = 0; 2978 sound_device_id = 0;
2978 /* device ID appears post g3 b&w */ 2979 /* device ID appears post g3 b&w */
2979 prop = (unsigned int *)get_property(info, "device-id", NULL); 2980 prop = get_property(info, "device-id", NULL);
2980 if (prop != 0) 2981 if (prop != 0)
2981 sound_device_id = *prop; 2982 sound_device_id = *prop;
2982 2983
2983 /* look for a property saying what sample rates 2984 /* look for a property saying what sample rates
2984 are available */ 2985 are available */
2985 2986
2986 prop = (unsigned int *)get_property(info, "sample-rates", &l); 2987 prop = get_property(info, "sample-rates", &l);
2987 if (prop == 0) 2988 if (prop == 0)
2988 prop = (unsigned int *) get_property 2989 prop = get_property(info, "output-frame-rates", &l);
2989 (info, "output-frame-rates", &l);
2990 2990
2991 /* if it's there use it to set up frame rates */ 2991 /* if it's there use it to set up frame rates */
2992 init_frame_rates(prop, l) ; 2992 init_frame_rates(prop, l) ;