Title: [7456] trunk/sound/soc/codecs/adau1371.c: adau1371: convert pr_* output funcs to dev_*
- Revision
- 7456
- Author
- vapier
- Date
- 2009-09-24 23:40:38 -0400 (Thu, 24 Sep 2009)
Log Message
adau1371: convert pr_* output funcs to dev_*
Modified Paths
Diff
Modified: trunk/sound/soc/codecs/adau1371.c (7455 => 7456)
--- trunk/sound/soc/codecs/adau1371.c 2009-09-25 03:29:45 UTC (rev 7455)
+++ trunk/sound/soc/codecs/adau1371.c 2009-09-25 03:40:38 UTC (rev 7456)
@@ -22,8 +22,6 @@
#include "adau1371.h"
-#define adau1371_VERSION "0.1"
-
struct snd_soc_codec_device soc_codec_dev_adau1371;
struct adau1371_priv {
@@ -885,7 +883,7 @@
/* register pcms */
ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
if (ret < 0) {
- pr_err("adau1371: failed to create pcms\n");
+ dev_err(socdev->dev, "failed to create pcms\n");
goto pcm_err;
}
/* Playback mix settings, line out switched to DACs*/
@@ -927,7 +925,7 @@
ARRAY_SIZE(adau1371_snd_controls));
ret = snd_soc_init_card(socdev);
if (ret < 0) {
- pr_err("adau1371: failed to register card\n");
+ dev_err(socdev->dev, "failed to register card\n");
goto card_err;
}
@@ -957,7 +955,7 @@
ret = adau1371_init(socdev);
if (ret < 0)
- pr_err("failed to initialise adau1371\n");
+ dev_err(&i2c->dev, "failed to initialize\n");
return ret;
}
@@ -1034,8 +1032,6 @@
struct adau1371_priv *adau1371;
int ret = 0;
- pr_info("adau1371 Audio Codec %s", adau1371_VERSION);
-
setup = socdev->codec_data;
codec = kzalloc(sizeof(*codec), GFP_KERNEL);
if (codec == NULL)
@@ -1063,6 +1059,8 @@
/* other interfaces */
#endif
+ dev_info(&pdev->dev, "codec initialized\n");
+
return ret;
}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
