Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit b898687

Browse files
tiwaitiwai
committed
ALSA: sb: Use standard print API
Use the standard print API with dev_*() instead of the old house-baked one. It gives better information and allows dynamically control of debug prints. Some functions are changed to receive snd_card pointer for referring to the device pointer for dev_*() calls, too. Reviewed-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://patch.msgid.link/20240807133452.9424-31-tiwai@suse.de
1 parent 40b15de commit b898687

File tree

10 files changed

+105
-94
lines changed

10 files changed

+105
-94
lines changed

‎sound/isa/sb/emu8000.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ snd_emu8000_detect(struct snd_emu8000 *emu)
160160
if ((EMU8000_HWCF2_READ(emu) & 0x0003) != 0x0003)
161161
return -ENODEV;
162162

163-
snd_printdd("EMU8000 [0x%lx]: Synth chip found\n",
164-
emu->port1);
163+
dev_dbg(emu->card->dev, "EMU8000 [0x%lx]: Synth chip found\n",
164+
emu->port1);
165165
return 0;
166166
}
167167

@@ -652,7 +652,7 @@ snd_emu8000_load_chorus_fx(struct snd_emu8000 *emu, int mode, const void __user
652652
{
653653
struct soundfont_chorus_fx rec;
654654
if (mode < SNDRV_EMU8000_CHORUS_PREDEFINED || mode >= SNDRV_EMU8000_CHORUS_NUMBERS) {
655-
snd_printk(KERN_WARNING "invalid chorus mode %d for uploading\n", mode);
655+
dev_warn(emu->card->dev, "invalid chorus mode %d for uploading\n", mode);
656656
return -EINVAL;
657657
}
658658
if (len < (long)sizeof(rec) || copy_from_user(&rec, buf, sizeof(rec)))
@@ -780,7 +780,7 @@ snd_emu8000_load_reverb_fx(struct snd_emu8000 *emu, int mode, const void __user
780780
struct soundfont_reverb_fx rec;
781781

782782
if (mode < SNDRV_EMU8000_REVERB_PREDEFINED || mode >= SNDRV_EMU8000_REVERB_NUMBERS) {
783-
snd_printk(KERN_WARNING "invalid reverb mode %d for uploading\n", mode);
783+
dev_warn(emu->card->dev, "invalid reverb mode %d for uploading\n", mode);
784784
return -EINVAL;
785785
}
786786
if (len < (long)sizeof(rec) || copy_from_user(&rec, buf, sizeof(rec)))
@@ -1072,7 +1072,8 @@ snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports,
10721072
if (!devm_request_region(card->dev, hw->port1, 4, "Emu8000-1") ||
10731073
!devm_request_region(card->dev, hw->port2, 4, "Emu8000-2") ||
10741074
!devm_request_region(card->dev, hw->port3, 4, "Emu8000-3")) {
1075-
snd_printk(KERN_ERR "sbawe: can't grab ports 0x%lx, 0x%lx, 0x%lx\n", hw->port1, hw->port2, hw->port3);
1075+
dev_err(card->dev, "sbawe: can't grab ports 0x%lx, 0x%lx, 0x%lx\n",
1076+
hw->port1, hw->port2, hw->port3);
10761077
return -EBUSY;
10771078
}
10781079
hw->mem_size = 0;

‎sound/isa/sb/emu8000_patch.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ snd_emu8000_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
157157

158158
sp->block = snd_util_mem_alloc(hdr, truesize * 2);
159159
if (sp->block == NULL) {
160-
/*snd_printd("EMU8000: out of memory\n");*/
161160
/* not ENOMEM (for compatibility) */
162161
return -ENOSPC;
163162
}

‎sound/isa/sb/emu8000_synth.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static int snd_emu8000_probe(struct device *_dev)
4545
emu->num_ports = hw->seq_ports;
4646

4747
if (hw->memhdr) {
48-
snd_printk(KERN_ERR "memhdr is already initialized!?\n");
48+
dev_err(hw->card->dev, "memhdr is already initialized!?\n");
4949
snd_util_memhdr_free(hw->memhdr);
5050
}
5151
hw->memhdr = snd_util_memhdr_new(hw->mem_size);

‎sound/isa/sb/jazz16.c‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,14 @@ static irqreturn_t jazz16_interrupt(int irq, void *chip)
7575
return snd_sb8dsp_interrupt(chip);
7676
}
7777

78-
static int jazz16_configure_ports(unsigned long port,
78+
static int jazz16_configure_ports(struct snd_card *card,
79+
unsigned long port,
7980
unsigned long mpu_port, int idx)
8081
{
8182
unsigned char val;
8283

8384
if (!request_region(0x201, 1, "jazz16 config")) {
84-
snd_printk(KERN_ERR "config port region is already in use.\n");
85+
dev_err(card->dev, "config port region is already in use.\n");
8586
return -EBUSY;
8687
}
8788
outb(SB_JAZZ16_WAKEUP - idx, 0x201);
@@ -96,15 +97,15 @@ static int jazz16_configure_ports(unsigned long port,
9697
return 0;
9798
}
9899

99-
static int jazz16_detect_board(unsigned long port,
100+
static int jazz16_detect_board(struct snd_card *card, unsigned long port,
100101
unsigned long mpu_port)
101102
{
102103
int err;
103104
int val;
104-
struct snd_sb chip;
105+
struct snd_sb chip = {};
105106

106107
if (!request_region(port, 0x10, "jazz16")) {
107-
snd_printk(KERN_ERR "I/O port region is already in use.\n");
108+
dev_err(card->dev, "I/O port region is already in use.\n");
108109
return -EBUSY;
109110
}
110111
/* just to call snd_sbdsp_command/reset/get_byte() */
@@ -113,7 +114,7 @@ static int jazz16_detect_board(unsigned long port,
113114
err = snd_sbdsp_reset(&chip);
114115
if (err < 0)
115116
for (val = 0; val < 4; val++) {
116-
err = jazz16_configure_ports(port, mpu_port, val);
117+
err = jazz16_configure_ports(card, port, mpu_port, val);
117118
if (err < 0)
118119
break;
119120

@@ -143,8 +144,8 @@ static int jazz16_detect_board(unsigned long port,
143144
}
144145
snd_sbdsp_get_byte(&chip);
145146
err = snd_sbdsp_get_byte(&chip);
146-
snd_printd("Media Vision Jazz16 board detected: rev 0x%x, model 0x%x\n",
147-
val, err);
147+
dev_dbg(card->dev, "Media Vision Jazz16 board detected: rev 0x%x, model 0x%x\n",
148+
val, err);
148149

149150
err = 0;
150151

@@ -185,31 +186,31 @@ static int snd_jazz16_match(struct device *devptr, unsigned int dev)
185186
if (!enable[dev])
186187
return 0;
187188
if (port[dev] == SNDRV_AUTO_PORT) {
188-
snd_printk(KERN_ERR "please specify port\n");
189+
dev_err(devptr, "please specify port\n");
189190
return 0;
190191
} else if (port[dev] == 0x200 || (port[dev] & ~0x270)) {
191-
snd_printk(KERN_ERR "incorrect port specified\n");
192+
dev_err(devptr, "incorrect port specified\n");
192193
return 0;
193194
}
194195
if (dma8[dev] != SNDRV_AUTO_DMA &&
195196
dma8[dev] != 1 && dma8[dev] != 3) {
196-
snd_printk(KERN_ERR "dma8 must be 1 or 3\n");
197+
dev_err(devptr, "dma8 must be 1 or 3\n");
197198
return 0;
198199
}
199200
if (dma16[dev] != SNDRV_AUTO_DMA &&
200201
dma16[dev] != 5 && dma16[dev] != 7) {
201-
snd_printk(KERN_ERR "dma16 must be 5 or 7\n");
202+
dev_err(devptr, "dma16 must be 5 or 7\n");
202203
return 0;
203204
}
204205
if (mpu_port[dev] != SNDRV_AUTO_PORT &&
205206
(mpu_port[dev] & ~0x030) != 0x300) {
206-
snd_printk(KERN_ERR "incorrect mpu_port specified\n");
207+
dev_err(devptr, "incorrect mpu_port specified\n");
207208
return 0;
208209
}
209210
if (mpu_irq[dev] != SNDRV_AUTO_DMA &&
210211
mpu_irq[dev] != 2 && mpu_irq[dev] != 3 &&
211212
mpu_irq[dev] != 5 && mpu_irq[dev] != 7) {
212-
snd_printk(KERN_ERR "mpu_irq must be 2, 3, 5 or 7\n");
213+
dev_err(devptr, "mpu_irq must be 2, 3, 5 or 7\n");
213214
return 0;
214215
}
215216
return 1;
@@ -237,33 +238,33 @@ static int snd_jazz16_probe(struct device *devptr, unsigned int dev)
237238
if (xirq == SNDRV_AUTO_IRQ) {
238239
xirq = snd_legacy_find_free_irq(possible_irqs);
239240
if (xirq < 0) {
240-
snd_printk(KERN_ERR "unable to find a free IRQ\n");
241+
dev_err(devptr, "unable to find a free IRQ\n");
241242
return -EBUSY;
242243
}
243244
}
244245
xdma8 = dma8[dev];
245246
if (xdma8 == SNDRV_AUTO_DMA) {
246247
xdma8 = snd_legacy_find_free_dma(possible_dmas8);
247248
if (xdma8 < 0) {
248-
snd_printk(KERN_ERR "unable to find a free DMA8\n");
249+
dev_err(devptr, "unable to find a free DMA8\n");
249250
return -EBUSY;
250251
}
251252
}
252253
xdma16 = dma16[dev];
253254
if (xdma16 == SNDRV_AUTO_DMA) {
254255
xdma16 = snd_legacy_find_free_dma(possible_dmas16);
255256
if (xdma16 < 0) {
256-
snd_printk(KERN_ERR "unable to find a free DMA16\n");
257+
dev_err(devptr, "unable to find a free DMA16\n");
257258
return -EBUSY;
258259
}
259260
}
260261

261262
xmpu_port = mpu_port[dev];
262263
if (xmpu_port == SNDRV_AUTO_PORT)
263264
xmpu_port = 0;
264-
err = jazz16_detect_board(port[dev], xmpu_port);
265+
err = jazz16_detect_board(card, port[dev], xmpu_port);
265266
if (err < 0) {
266-
printk(KERN_ERR "Media Vision Jazz16 board not detected\n");
267+
dev_err(devptr, "Media Vision Jazz16 board not detected\n");
267268
return err;
268269
}
269270
err = snd_sbdsp_create(card, port[dev], irq[dev],
@@ -279,7 +280,7 @@ static int snd_jazz16_probe(struct device *devptr, unsigned int dev)
279280
xmpu_irq = 0;
280281
err = jazz16_configure_board(chip, xmpu_irq);
281282
if (err < 0) {
282-
printk(KERN_ERR "Media Vision Jazz16 configuration failed\n");
283+
dev_err(devptr, "Media Vision Jazz16 configuration failed\n");
283284
return err;
284285
}
285286

@@ -301,8 +302,8 @@ static int snd_jazz16_probe(struct device *devptr, unsigned int dev)
301302
err = snd_opl3_create(card, chip->port, chip->port + 2,
302303
OPL3_HW_AUTO, 1, &opl3);
303304
if (err < 0)
304-
snd_printk(KERN_WARNING "no OPL device at 0x%lx-0x%lx\n",
305-
chip->port, chip->port + 2);
305+
dev_warn(devptr, "no OPL device at 0x%lx-0x%lx\n",
306+
chip->port, chip->port + 2);
306307
else {
307308
err = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
308309
if (err < 0)
@@ -317,8 +318,8 @@ static int snd_jazz16_probe(struct device *devptr, unsigned int dev)
317318
mpu_port[dev], 0,
318319
mpu_irq[dev],
319320
NULL) < 0)
320-
snd_printk(KERN_ERR "no MPU-401 device at 0x%lx\n",
321-
mpu_port[dev]);
321+
dev_err(devptr, "no MPU-401 device at 0x%lx\n",
322+
mpu_port[dev]);
322323
}
323324

324325
err = snd_card_register(card);

‎sound/isa/sb/sb16.c‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
#define SNDRV_LEGACY_FIND_FREE_DMA
2222
#include <sound/initval.h>
2323

24-
#ifdef SNDRV_SBAWE
25-
#define PFX "sbawe: "
26-
#else
27-
#define PFX "sb16: "
28-
#endif
29-
3024
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
3125
MODULE_LICENSE("GPL");
3226
#ifndef SNDRV_SBAWE
@@ -246,7 +240,7 @@ static int snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,
246240

247241
err = pnp_activate_dev(pdev);
248242
if (err < 0) {
249-
snd_printk(KERN_ERR PFX "AUDIO pnp configure failure\n");
243+
dev_err(&pdev->dev, "AUDIO pnp configure failure\n");
250244
return err;
251245
}
252246
port[dev] = pnp_port_start(pdev, 0);
@@ -255,10 +249,10 @@ static int snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,
255249
dma8[dev] = pnp_dma(pdev, 0);
256250
dma16[dev] = pnp_dma(pdev, 1);
257251
irq[dev] = pnp_irq(pdev, 0);
258-
snd_printdd("pnp SB16: port=0x%lx, mpu port=0x%lx, fm port=0x%lx\n",
259-
port[dev], mpu_port[dev], fm_port[dev]);
260-
snd_printdd("pnp SB16: dma1=%i, dma2=%i, irq=%i\n",
261-
dma8[dev], dma16[dev], irq[dev]);
252+
dev_dbg(&pdev->dev, "pnp SB16: port=0x%lx, mpu port=0x%lx, fm port=0x%lx\n",
253+
port[dev], mpu_port[dev], fm_port[dev]);
254+
dev_dbg(&pdev->dev, "pnp SB16: dma1=%i, dma2=%i, irq=%i\n",
255+
dma8[dev], dma16[dev], irq[dev]);
262256
#ifdef SNDRV_SBAWE_EMU8000
263257
/* WaveTable initialization */
264258
pdev = acard->devwt;
@@ -268,13 +262,13 @@ static int snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,
268262
goto __wt_error;
269263
}
270264
awe_port[dev] = pnp_port_start(pdev, 0);
271-
snd_printdd("pnp SB16: wavetable port=0x%llx\n",
272-
(unsigned long long)pnp_port_start(pdev, 0));
265+
dev_dbg(&pdev->dev, "pnp SB16: wavetable port=0x%llx\n",
266+
(unsigned long long)pnp_port_start(pdev, 0));
273267
} else {
274268
__wt_error:
275269
if (pdev) {
276270
pnp_release_card_device(pdev);
277-
snd_printk(KERN_ERR PFX "WaveTable pnp configure failure\n");
271+
dev_err(&pdev->dev, "WaveTable pnp configure failure\n");
278272
}
279273
acard->devwt = NULL;
280274
awe_port[dev] = -1;
@@ -329,7 +323,7 @@ static int snd_sb16_probe(struct snd_card *card, int dev)
329323

330324
acard->chip = chip;
331325
if (chip->hardware != SB_HW_16) {
332-
snd_printk(KERN_ERR PFX "SB 16 chip was not detected at 0x%lx\n", port[dev]);
326+
dev_err(card->dev, "SB 16 chip was not detected at 0x%lx\n", port[dev]);
333327
return -ENODEV;
334328
}
335329
chip->mpu_port = mpu_port[dev];
@@ -379,8 +373,8 @@ static int snd_sb16_probe(struct snd_card *card, int dev)
379373
OPL3_HW_OPL3,
380374
acard->fm_res != NULL || fm_port[dev] == port[dev],
381375
&opl3) < 0) {
382-
snd_printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",
383-
fm_port[dev], fm_port[dev] + 2);
376+
dev_err(card->dev, "no OPL device at 0x%lx-0x%lx\n",
377+
fm_port[dev], fm_port[dev] + 2);
384378
} else {
385379
#ifdef SNDRV_SBAWE_EMU8000
386380
int seqdev = awe_port[dev] > 0 ? 2 : 1;
@@ -405,7 +399,9 @@ static int snd_sb16_probe(struct snd_card *card, int dev)
405399
chip->csp = xcsp->private_data;
406400
chip->hardware = SB_HW_16CSP;
407401
} else {
408-
snd_printk(KERN_INFO PFX "warning - CSP chip not detected on soundcard #%i\n", dev + 1);
402+
dev_info(card->dev,
403+
"warning - CSP chip not detected on soundcard #%i\n",
404+
dev + 1);
409405
}
410406
}
411407
#endif
@@ -414,7 +410,9 @@ static int snd_sb16_probe(struct snd_card *card, int dev)
414410
err = snd_emu8000_new(card, 1, awe_port[dev],
415411
seq_ports[dev], NULL);
416412
if (err < 0) {
417-
snd_printk(KERN_ERR PFX "fatal error - EMU-8000 synthesizer not detected at 0x%lx\n", awe_port[dev]);
413+
dev_err(card->dev,
414+
"fatal error - EMU-8000 synthesizer not detected at 0x%lx\n",
415+
awe_port[dev]);
418416

419417
return err;
420418
}
@@ -502,21 +500,21 @@ static int snd_sb16_isa_probe(struct device *pdev, unsigned int dev)
502500
if (irq[dev] == SNDRV_AUTO_IRQ) {
503501
irq[dev] = snd_legacy_find_free_irq(possible_irqs);
504502
if (irq[dev] < 0) {
505-
snd_printk(KERN_ERR PFX "unable to find a free IRQ\n");
503+
dev_err(pdev, "unable to find a free IRQ\n");
506504
return -EBUSY;
507505
}
508506
}
509507
if (dma8[dev] == SNDRV_AUTO_DMA) {
510508
dma8[dev] = snd_legacy_find_free_dma(possible_dmas8);
511509
if (dma8[dev] < 0) {
512-
snd_printk(KERN_ERR PFX "unable to find a free 8-bit DMA\n");
510+
dev_err(pdev, "unable to find a free 8-bit DMA\n");
513511
return -EBUSY;
514512
}
515513
}
516514
if (dma16[dev] == SNDRV_AUTO_DMA) {
517515
dma16[dev] = snd_legacy_find_free_dma(possible_dmas16);
518516
if (dma16[dev] < 0) {
519-
snd_printk(KERN_ERR PFX "unable to find a free 16-bit DMA\n");
517+
dev_err(pdev, "unable to find a free 16-bit DMA\n");
520518
return -EBUSY;
521519
}
522520
}

0 commit comments

Comments
 (0)