@@ -110,20 +110,20 @@ static int __devinit snd_bcm2835_alsa_probe(struct platform_device *pdev)
110
110
111
111
err = snd_bcm2835_create (g_card , pdev , & chip );
112
112
if (err < 0 ) {
113
- printk ( KERN_ERR "Failed to create bcm2835 chip\n" );
113
+ dev_err ( & pdev -> dev , "Failed to create bcm2835 chip\n" );
114
114
goto out_bcm2835_create ;
115
115
}
116
116
117
117
g_chip = chip ;
118
118
err = snd_bcm2835_new_pcm (chip );
119
119
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" );
121
121
goto out_bcm2835_new_pcm ;
122
122
}
123
123
124
124
err = snd_bcm2835_new_ctl (chip );
125
125
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" );
127
127
goto out_bcm2835_new_ctl ;
128
128
}
129
129
@@ -139,14 +139,14 @@ static int __devinit snd_bcm2835_alsa_probe(struct platform_device *pdev)
139
139
if (dev == 0 ) {
140
140
err = snd_card_register (card );
141
141
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" );
144
144
goto out_card_register ;
145
145
}
146
146
platform_set_drvdata (pdev , card );
147
- printk ( KERN_INFO "bcm2835 ALSA card created!\n" );
147
+ audio_info ( "bcm2835 ALSA card created!\n" );
148
148
} else {
149
- printk ( KERN_INFO "bcm2835 ALSA chip created!\n" );
149
+ audio_info ( "bcm2835 ALSA chip created!\n" );
150
150
platform_set_drvdata (pdev , (void * )dev );
151
151
}
152
152
@@ -160,11 +160,11 @@ static int __devinit snd_bcm2835_alsa_probe(struct platform_device *pdev)
160
160
out_bcm2835_create :
161
161
BUG_ON (!g_card );
162
162
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" );
164
164
g_card = NULL ;
165
165
out :
166
166
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" );
168
168
return err ;
169
169
}
170
170
@@ -326,49 +326,49 @@ static int __devinit bcm2835_alsa_device_init(void)
326
326
int err ;
327
327
err = platform_driver_register (& bcm2835_alsa0_driver );
328
328
if (err ) {
329
- printk ("Error registering bcm2835_alsa0_driver %d .\n" , err );
329
+ pr_err ("Error registering bcm2835_alsa0_driver %d .\n" , err );
330
330
goto out ;
331
331
}
332
332
333
333
err = platform_driver_register (& bcm2835_alsa1_driver );
334
334
if (err ) {
335
- printk ("Error registering bcm2835_alsa1_driver %d .\n" , err );
335
+ pr_err ("Error registering bcm2835_alsa0_driver %d .\n" , err );
336
336
goto unregister_0 ;
337
337
}
338
338
339
339
err = platform_driver_register (& bcm2835_alsa2_driver );
340
340
if (err ) {
341
- printk ("Error registering bcm2835_alsa2_driver %d .\n" , err );
341
+ pr_err ("Error registering bcm2835_alsa0_driver %d .\n" , err );
342
342
goto unregister_1 ;
343
343
}
344
344
345
345
err = platform_driver_register (& bcm2835_alsa3_driver );
346
346
if (err ) {
347
- printk ("Error registering bcm2835_alsa3_driver %d .\n" , err );
347
+ pr_err ("Error registering bcm2835_alsa0_driver %d .\n" , err );
348
348
goto unregister_2 ;
349
349
}
350
350
351
351
err = platform_driver_register (& bcm2835_alsa4_driver );
352
352
if (err ) {
353
- printk ("Error registering bcm2835_alsa4_driver %d .\n" , err );
353
+ pr_err ("Error registering bcm2835_alsa0_driver %d .\n" , err );
354
354
goto unregister_3 ;
355
355
}
356
356
357
357
err = platform_driver_register (& bcm2835_alsa5_driver );
358
358
if (err ) {
359
- printk ("Error registering bcm2835_alsa5_driver %d .\n" , err );
359
+ pr_err ("Error registering bcm2835_alsa0_driver %d .\n" , err );
360
360
goto unregister_4 ;
361
361
}
362
362
363
363
err = platform_driver_register (& bcm2835_alsa6_driver );
364
364
if (err ) {
365
- printk ("Error registering bcm2835_alsa6_driver %d .\n" , err );
365
+ pr_err ("Error registering bcm2835_alsa0_driver %d .\n" , err );
366
366
goto unregister_5 ;
367
367
}
368
368
369
369
err = platform_driver_register (& bcm2835_alsa7_driver );
370
370
if (err ) {
371
- printk ("Error registering bcm2835_alsa7_driver %d .\n" , err );
371
+ pr_err ("Error registering bcm2835_alsa0_driver %d .\n" , err );
372
372
goto unregister_6 ;
373
373
}
374
374
0 commit comments