Skip to content

Commit 31e3bcd

Browse files
author
Javier Martinez Canillas
committed
ALSA: bcm2835: show card and subdev creation msg only on debug
On driver probe a message showing that a card and its subdevices have been created is shown. Probably this message is not needed unless we have debug enabled on the driver. So, use the driver audio_info() debug macro instead of just printk(). Also is better to use dev_err() and pr_err() instead KERN_ERR. Signed-off-by: Javier Martinez Canillas <[email protected]>
1 parent 07b8b7d commit 31e3bcd

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

sound/arm/bcm2835.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,20 @@ static int __devinit snd_bcm2835_alsa_probe(struct platform_device *pdev)
110110

111111
err = snd_bcm2835_create(g_card, pdev, &chip);
112112
if (err < 0) {
113-
printk(KERN_ERR "Failed to create bcm2835 chip\n");
113+
dev_err(&pdev->dev, "Failed to create bcm2835 chip\n");
114114
goto out_bcm2835_create;
115115
}
116116

117117
g_chip = chip;
118118
err = snd_bcm2835_new_pcm(chip);
119119
if (err < 0) {
120-
printk(KERN_ERR "Failed to create new BCM2835 pcm device\n");
120+
dev_err(&pdev->dev, "Failed to create new BCM2835 pcm device\n");
121121
goto out_bcm2835_new_pcm;
122122
}
123123

124124
err = snd_bcm2835_new_ctl(chip);
125125
if (err < 0) {
126-
printk(KERN_ERR "Failed to create new BCM2835 ctl\n");
126+
dev_err(&pdev->dev, "Failed to create new BCM2835 ctl\n");
127127
goto out_bcm2835_new_ctl;
128128
}
129129

@@ -139,14 +139,14 @@ static int __devinit snd_bcm2835_alsa_probe(struct platform_device *pdev)
139139
if (dev == 0) {
140140
err = snd_card_register(card);
141141
if (err < 0) {
142-
printk(KERN_ERR
143-
"Failed to register bcm2835 ALSA card \n");
142+
dev_err(&pdev->dev,
143+
"Failed to register bcm2835 ALSA card \n");
144144
goto out_card_register;
145145
}
146146
platform_set_drvdata(pdev, card);
147-
printk(KERN_INFO "bcm2835 ALSA card created!\n");
147+
audio_info("bcm2835 ALSA card created!\n");
148148
} else {
149-
printk(KERN_INFO "bcm2835 ALSA chip created!\n");
149+
audio_info("bcm2835 ALSA chip created!\n");
150150
platform_set_drvdata(pdev, (void *)dev);
151151
}
152152

@@ -160,11 +160,11 @@ static int __devinit snd_bcm2835_alsa_probe(struct platform_device *pdev)
160160
out_bcm2835_create:
161161
BUG_ON(!g_card);
162162
if (snd_card_free(g_card))
163-
printk(KERN_ERR "Failed to free Registered alsa card\n");
163+
dev_err(&pdev->dev, "Failed to free Registered alsa card\n");
164164
g_card = NULL;
165165
out:
166166
dev = SNDRV_CARDS; /* stop more avail_substreams from being probed */
167-
printk(KERN_ERR "BCM2835 ALSA Probe failed !!\n");
167+
dev_err(&pdev->dev, "BCM2835 ALSA Probe failed !!\n");
168168
return err;
169169
}
170170

@@ -326,49 +326,49 @@ static int __devinit bcm2835_alsa_device_init(void)
326326
int err;
327327
err = platform_driver_register(&bcm2835_alsa0_driver);
328328
if (err) {
329-
printk("Error registering bcm2835_alsa0_driver %d .\n", err);
329+
pr_err("Error registering bcm2835_alsa0_driver %d .\n", err);
330330
goto out;
331331
}
332332

333333
err = platform_driver_register(&bcm2835_alsa1_driver);
334334
if (err) {
335-
printk("Error registering bcm2835_alsa1_driver %d .\n", err);
335+
pr_err("Error registering bcm2835_alsa0_driver %d .\n", err);
336336
goto unregister_0;
337337
}
338338

339339
err = platform_driver_register(&bcm2835_alsa2_driver);
340340
if (err) {
341-
printk("Error registering bcm2835_alsa2_driver %d .\n", err);
341+
pr_err("Error registering bcm2835_alsa0_driver %d .\n", err);
342342
goto unregister_1;
343343
}
344344

345345
err = platform_driver_register(&bcm2835_alsa3_driver);
346346
if (err) {
347-
printk("Error registering bcm2835_alsa3_driver %d .\n", err);
347+
pr_err("Error registering bcm2835_alsa0_driver %d .\n", err);
348348
goto unregister_2;
349349
}
350350

351351
err = platform_driver_register(&bcm2835_alsa4_driver);
352352
if (err) {
353-
printk("Error registering bcm2835_alsa4_driver %d .\n", err);
353+
pr_err("Error registering bcm2835_alsa0_driver %d .\n", err);
354354
goto unregister_3;
355355
}
356356

357357
err = platform_driver_register(&bcm2835_alsa5_driver);
358358
if (err) {
359-
printk("Error registering bcm2835_alsa5_driver %d .\n", err);
359+
pr_err("Error registering bcm2835_alsa0_driver %d .\n", err);
360360
goto unregister_4;
361361
}
362362

363363
err = platform_driver_register(&bcm2835_alsa6_driver);
364364
if (err) {
365-
printk("Error registering bcm2835_alsa6_driver %d .\n", err);
365+
pr_err("Error registering bcm2835_alsa0_driver %d .\n", err);
366366
goto unregister_5;
367367
}
368368

369369
err = platform_driver_register(&bcm2835_alsa7_driver);
370370
if (err) {
371-
printk("Error registering bcm2835_alsa7_driver %d .\n", err);
371+
pr_err("Error registering bcm2835_alsa0_driver %d .\n", err);
372372
goto unregister_6;
373373
}
374374

0 commit comments

Comments
 (0)