From 5d2e371f9eb8d5103a17b5914259ac1718e00afc Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Mon, 19 Nov 2012 14:39:14 +0000 Subject: [PATCH] --- yaml --- r: 342751 b: refs/heads/master c: 008d55e258d8d9a5bfe03d652779cd14c770c60a h: refs/heads/master i: 342749: d502a2216dad73b6959ca61649d006f68e29f54f 342747: 5a1ce44f38ea52973df4ae7f4095460a39990e26 342743: a3f0972e289b828b62c91542e0899237f61a86d7 342735: 18a9d312eb72518adda890be172c66d413821871 342719: 309bc8e24b2a70c4a6e167e8ed65fcfa237d1b94 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-jack.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 4b66050e7e80..dd645e9de971 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 204b62c6bc1b8d3ce405c59281585af523b14172 +refs/heads/master: 008d55e258d8d9a5bfe03d652779cd14c770c60a diff --git a/trunk/sound/soc/soc-jack.c b/trunk/sound/soc/soc-jack.c index 1ab5fe04bfcc..8da7d8a8ee70 100644 --- a/trunk/sound/soc/soc-jack.c +++ b/trunk/sound/soc/soc-jack.c @@ -172,12 +172,13 @@ int snd_soc_jack_add_pins(struct snd_soc_jack *jack, int count, for (i = 0; i < count; i++) { if (!pins[i].pin) { - printk(KERN_ERR "No name for pin %d\n", i); + dev_err(jack->codec->dev, "ASoC: No name for pin %d\n", + i); return -EINVAL; } if (!pins[i].mask) { - printk(KERN_ERR "No mask for pin %d (%s)\n", i, - pins[i].pin); + dev_err(jack->codec->dev, "ASoC: No mask for pin %d" + " (%s)\n", i, pins[i].pin); return -EINVAL; } @@ -297,13 +298,13 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, for (i = 0; i < count; i++) { if (!gpio_is_valid(gpios[i].gpio)) { - printk(KERN_ERR "Invalid gpio %d\n", + dev_err(jack->codec->dev, "ASoC: Invalid gpio %d\n", gpios[i].gpio); ret = -EINVAL; goto undo; } if (!gpios[i].name) { - printk(KERN_ERR "No name for gpio %d\n", + dev_err(jack->codec->dev, "ASoC: No name for gpio %d\n", gpios[i].gpio); ret = -EINVAL; goto undo; @@ -332,7 +333,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, if (gpios[i].wake) { ret = irq_set_irq_wake(gpio_to_irq(gpios[i].gpio), 1); if (ret != 0) - printk(KERN_ERR + dev_err(jack->codec->dev, "ASoC: " "Failed to mark GPIO %d as wake source: %d\n", gpios[i].gpio, ret); }