diff options
Diffstat (limited to 'sound/pci/au88x0')
-rw-r--r-- | sound/pci/au88x0/au88x0.c | 2 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0_a3d.c | 2 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0_core.c | 4 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0_eq.c | 2 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0_synth.c | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c index 04b695d6fd48..6af3b13f2fd1 100644 --- a/sound/pci/au88x0/au88x0.c +++ b/sound/pci/au88x0/au88x0.c | |||
@@ -303,7 +303,7 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) | |||
303 | if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_VORTEX_SYNTH, | 303 | if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_VORTEX_SYNTH, |
304 | sizeof(snd_vortex_synth_arg_t), &wave) < 0 | 304 | sizeof(snd_vortex_synth_arg_t), &wave) < 0 |
305 | || wave == NULL) { | 305 | || wave == NULL) { |
306 | snd_printk("Can't initialize Aureal wavetable synth\n"); | 306 | snd_printk(KERN_ERR "Can't initialize Aureal wavetable synth\n"); |
307 | } else { | 307 | } else { |
308 | snd_vortex_synth_arg_t *arg; | 308 | snd_vortex_synth_arg_t *arg; |
309 | 309 | ||
diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c index 9ea2ba7bc3c8..d5755db5141f 100644 --- a/sound/pci/au88x0/au88x0_a3d.c +++ b/sound/pci/au88x0/au88x0_a3d.c | |||
@@ -488,7 +488,7 @@ static void a3dsrc_ZeroStateA3D(a3dsrc_t * a) | |||
488 | int i, var, var2; | 488 | int i, var, var2; |
489 | 489 | ||
490 | if ((a->vortex) == NULL) { | 490 | if ((a->vortex) == NULL) { |
491 | printk("vortex: ZeroStateA3D: ERROR: a->vortex is NULL\n"); | 491 | printk(KERN_ERR "vortex: ZeroStateA3D: ERROR: a->vortex is NULL\n"); |
492 | return; | 492 | return; |
493 | } | 493 | } |
494 | 494 | ||
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c index 91ac4f3a2aac..5905188d06b5 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c | |||
@@ -2033,7 +2033,7 @@ vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype) | |||
2033 | } | 2033 | } |
2034 | } | 2034 | } |
2035 | } | 2035 | } |
2036 | printk("vortex: FATAL: ResManager: resource type %d exhausted.\n", restype); | 2036 | printk(KERN_ERR "vortex: FATAL: ResManager: resource type %d exhausted.\n", restype); |
2037 | return -ENOMEM; | 2037 | return -ENOMEM; |
2038 | } | 2038 | } |
2039 | 2039 | ||
@@ -2165,7 +2165,7 @@ vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type) | |||
2165 | memset(stream->resources, 0, | 2165 | memset(stream->resources, 0, |
2166 | sizeof(unsigned char) * | 2166 | sizeof(unsigned char) * |
2167 | VORTEX_RESOURCE_LAST); | 2167 | VORTEX_RESOURCE_LAST); |
2168 | printk("vortex: out of A3D sources. Sorry\n"); | 2168 | printk(KERN_ERR "vortex: out of A3D sources. Sorry\n"); |
2169 | return -EBUSY; | 2169 | return -EBUSY; |
2170 | } | 2170 | } |
2171 | /* (De)Initialize A3D hardware source. */ | 2171 | /* (De)Initialize A3D hardware source. */ |
diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c index 53b47a42c7d8..9d933cc0ea0b 100644 --- a/sound/pci/au88x0/au88x0_eq.c +++ b/sound/pci/au88x0/au88x0_eq.c | |||
@@ -854,7 +854,7 @@ snd_vortex_peaks_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) | |||
854 | 854 | ||
855 | vortex_Eqlzr_GetAllPeaks(vortex, peaks, &count); | 855 | vortex_Eqlzr_GetAllPeaks(vortex, peaks, &count); |
856 | if (count != 20) { | 856 | if (count != 20) { |
857 | printk("vortex: peak count error 20 != %d \n", count); | 857 | printk(KERN_ERR "vortex: peak count error 20 != %d \n", count); |
858 | return -1; | 858 | return -1; |
859 | } | 859 | } |
860 | for (i = 0; i < 20; i++) | 860 | for (i = 0; i < 20; i++) |
diff --git a/sound/pci/au88x0/au88x0_synth.c b/sound/pci/au88x0/au88x0_synth.c index 400417d34609..65f375bad43a 100644 --- a/sound/pci/au88x0/au88x0_synth.c +++ b/sound/pci/au88x0/au88x0_synth.c | |||
@@ -90,7 +90,7 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch) | |||
90 | hwwrite(vortex->mmio, WT_PARM(wt, 2), 0); | 90 | hwwrite(vortex->mmio, WT_PARM(wt, 2), 0); |
91 | 91 | ||
92 | temp = hwread(vortex->mmio, WT_PARM(wt, 3)); | 92 | temp = hwread(vortex->mmio, WT_PARM(wt, 3)); |
93 | printk("vortex: WT PARM3: %x\n", temp); | 93 | printk(KERN_DEBUG "vortex: WT PARM3: %x\n", temp); |
94 | //hwwrite(vortex->mmio, WT_PARM(wt, 3), temp); | 94 | //hwwrite(vortex->mmio, WT_PARM(wt, 3), temp); |
95 | 95 | ||
96 | hwwrite(vortex->mmio, WT_DELAY(wt, 0), 0); | 96 | hwwrite(vortex->mmio, WT_DELAY(wt, 0), 0); |
@@ -98,7 +98,7 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch) | |||
98 | hwwrite(vortex->mmio, WT_DELAY(wt, 2), 0); | 98 | hwwrite(vortex->mmio, WT_DELAY(wt, 2), 0); |
99 | hwwrite(vortex->mmio, WT_DELAY(wt, 3), 0); | 99 | hwwrite(vortex->mmio, WT_DELAY(wt, 3), 0); |
100 | 100 | ||
101 | printk("vortex: WT GMODE: %x\n", hwread(vortex->mmio, WT_GMODE(wt))); | 101 | printk(KERN_DEBUG "vortex: WT GMODE: %x\n", hwread(vortex->mmio, WT_GMODE(wt))); |
102 | 102 | ||
103 | hwwrite(vortex->mmio, WT_PARM(wt, 2), 0xffffffff); | 103 | hwwrite(vortex->mmio, WT_PARM(wt, 2), 0xffffffff); |
104 | hwwrite(vortex->mmio, WT_PARM(wt, 3), 0xcff1c810); | 104 | hwwrite(vortex->mmio, WT_PARM(wt, 3), 0xcff1c810); |
@@ -106,7 +106,7 @@ static int vortex_wt_allocroute(vortex_t * vortex, int wt, int nr_ch) | |||
106 | voice->parm0 = voice->parm1 = 0xcfb23e2f; | 106 | voice->parm0 = voice->parm1 = 0xcfb23e2f; |
107 | hwwrite(vortex->mmio, WT_PARM(wt, 0), voice->parm0); | 107 | hwwrite(vortex->mmio, WT_PARM(wt, 0), voice->parm0); |
108 | hwwrite(vortex->mmio, WT_PARM(wt, 1), voice->parm1); | 108 | hwwrite(vortex->mmio, WT_PARM(wt, 1), voice->parm1); |
109 | printk("vortex: WT GMODE 2 : %x\n", hwread(vortex->mmio, WT_GMODE(wt))); | 109 | printk(KERN_DEBUG "vortex: WT GMODE 2 : %x\n", hwread(vortex->mmio, WT_GMODE(wt))); |
110 | return 0; | 110 | return 0; |
111 | } | 111 | } |
112 | 112 | ||
@@ -203,7 +203,7 @@ vortex_wt_SetReg(vortex_t * vortex, unsigned char reg, int wt, | |||
203 | } | 203 | } |
204 | } else { | 204 | } else { |
205 | if (wt >= NR_WT) { | 205 | if (wt >= NR_WT) { |
206 | printk("vortex: WT SetReg: voice out of range\n"); | 206 | printk(KERN_ERR "vortex: WT SetReg: voice out of range\n"); |
207 | return 0; | 207 | return 0; |
208 | } | 208 | } |
209 | } | 209 | } |