Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[can-eth-gw-linux.git] / sound / soc / soc-jack.c

diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 1ab5fe04bfccb066853fc664d9db9bea68a9f8ce..0bb5cccd77663a4d819a67731245e51564af3224 100644 (file)
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -66,7 +66,6 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
        struct snd_soc_dapm_context *dapm;
        struct snd_soc_jack_pin *pin;
        int enable;
-       int oldstatus;
 
        trace_snd_soc_jack_report(jack, mask, status);
 
@@ -78,8 +77,6 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
 
        mutex_lock(&jack->mutex);
 
-       oldstatus = jack->status;
-
        jack->status &= ~mask;
        jack->status |= status & mask;
 
@@ -172,12 +169,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 +295,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 +330,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);
                }