6 files changed, 41 insertions, 39 deletions

diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c
index 820d8fa62b5e..fb8ea05c0de1 100644
--- a/sound/soc/codecs/rt5659.c
+++ b/sound/soc/codecs/rt5659.c
@@ -3985,7 +3985,6 @@ static int rt5659_i2c_probe(struct i2c_client *i2c,
         if (rt5659 == NULL)
                 return -ENOMEM;
 
-        rt5659->i2c = i2c;
         i2c_set_clientdata(i2c, rt5659);
 
         if (pdata)
@@ -4157,24 +4156,17 @@ static int rt5659_i2c_probe(struct i2c_client *i2c,
 
         INIT_DELAYED_WORK(&rt5659->jack_detect_work, rt5659_jack_detect_work);
 
-        if (rt5659->i2c->irq) {
-                ret = request_threaded_irq(rt5659->i2c->irq, NULL, rt5659_irq,
-                        IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
+        if (i2c->irq) {
+                ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL,
+                        rt5659_irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
                         | IRQF_ONESHOT, "rt5659", rt5659);
                 if (ret)
                         dev_err(&i2c->dev, "Failed to reguest IRQ: %d\n", ret);
 
         }
 
-        ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5659,
+        return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5659,
                         rt5659_dai, ARRAY_SIZE(rt5659_dai));
-
-        if (ret) {
-                if (rt5659->i2c->irq)
-                        free_irq(rt5659->i2c->irq, rt5659);
-        }
-
-        return 0;
 }
 
 static int rt5659_i2c_remove(struct i2c_client *i2c)
@@ -4191,24 +4183,29 @@ void rt5659_i2c_shutdown(struct i2c_client *client)
         regmap_write(rt5659->regmap, RT5659_RESET, 0);
 }
 
+#ifdef CONFIG_OF
 static const struct of_device_id rt5659_of_match[] = {
         { .compatible = "realtek,rt5658", },
         { .compatible = "realtek,rt5659", },
-        {},
+        { },
 };
+MODULE_DEVICE_TABLE(of, rt5659_of_match);
+#endif
 
+#ifdef CONFIG_ACPI
 static struct acpi_device_id rt5659_acpi_match[] = {
-                { "10EC5658", 0},
-                { "10EC5659", 0},
-                { },
+        { "10EC5658", 0, },
+        { "10EC5659", 0, },
+        { },
 };
 MODULE_DEVICE_TABLE(acpi, rt5659_acpi_match);
+#endif
 
 struct i2c_driver rt5659_i2c_driver = {
         .driver = {
                 .name = "rt5659",
                 .owner = THIS_MODULE,
-                .of_match_table = rt5659_of_match,
+                .of_match_table = of_match_ptr(rt5659_of_match),
                 .acpi_match_table = ACPI_PTR(rt5659_acpi_match),
         },
         .probe = rt5659_i2c_probe,
diff --git a/sound/soc/codecs/rt5659.h b/sound/soc/codecs/rt5659.h
index 8f07ee903eaa..d31c9e5bcec8 100644
--- a/sound/soc/codecs/rt5659.h
+++ b/sound/soc/codecs/rt5659.h
@@ -1792,7 +1792,6 @@ struct rt5659_priv {
         struct snd_soc_codec *codec;
         struct rt5659_platform_data pdata;
         struct regmap *regmap;
-        struct i2c_client *i2c;
         struct gpio_desc *gpiod_ldo1_en;
         struct gpio_desc *gpiod_reset;
         struct snd_soc_jack *hs_jack;
diff --git a/sound/soc/codecs/sigmadsp-i2c.c b/sound/soc/codecs/sigmadsp-i2c.c
index 21ca3a5e9f66..d374c18d4db7 100644
--- a/sound/soc/codecs/sigmadsp-i2c.c
+++ b/sound/soc/codecs/sigmadsp-i2c.c
@@ -31,7 +31,10 @@ static int sigmadsp_write_i2c(void *control_data,
 
         kfree(buf);
 
-        return ret;
+        if (ret < 0)
+                return ret;
+
+        return 0;
 }
 
 static int sigmadsp_read_i2c(void *control_data,
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 6088d30962a9..97c0f1e23886 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -2382,6 +2382,7 @@ error:
 
 static int wm5110_remove(struct platform_device *pdev)
 {
+        snd_soc_unregister_platform(&pdev->dev);
         snd_soc_unregister_codec(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
 
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index ff237726775a..d7f444f87460 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -240,13 +240,13 @@ SOC_DOUBLE_R("Capture Volume ZC Switch", WM8960_LINVOL, WM8960_RINVOL,
 SOC_DOUBLE_R("Capture Switch", WM8960_LINVOL, WM8960_RINVOL,
         7, 1, 1),
 
-SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT3 Volume",
+SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT3 Volume",
                WM8960_INBMIX1, 4, 7, 0, lineinboost_tlv),
-SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT2 Volume",
+SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT2 Volume",
                WM8960_INBMIX1, 1, 7, 0, lineinboost_tlv),
-SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT3 Volume",
+SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT3 Volume",
                WM8960_INBMIX2, 4, 7, 0, lineinboost_tlv),
-SOC_SINGLE_TLV("Left Input Boost Mixer LINPUT2 Volume",
+SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT2 Volume",
                WM8960_INBMIX2, 1, 7, 0, lineinboost_tlv),
 SOC_SINGLE_TLV("Right Input Boost Mixer RINPUT1 Volume",
                 WM8960_RINPATH, 4, 3, 0, micboost_tlv),
@@ -643,29 +643,31 @@ static int wm8960_configure_clocking(struct snd_soc_codec *codec)
                 return -EINVAL;
         }
 
-        /* check if the sysclk frequency is available. */
-        for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) {
-                if (sysclk_divs[i] == -1)
-                        continue;
-                sysclk = freq_out / sysclk_divs[i];
-                for (j = 0; j < ARRAY_SIZE(dac_divs); ++j) {
-                        if (sysclk == dac_divs[j] * lrclk) {
+        if (wm8960->clk_id != WM8960_SYSCLK_PLL) {
+                /* check if the sysclk frequency is available. */
+                for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) {
+                        if (sysclk_divs[i] == -1)
+                                continue;
+                        sysclk = freq_out / sysclk_divs[i];
+                        for (j = 0; j < ARRAY_SIZE(dac_divs); ++j) {
+                                if (sysclk != dac_divs[j] * lrclk)
+                                        continue;
                                 for (k = 0; k < ARRAY_SIZE(bclk_divs); ++k)
                                         if (sysclk == bclk * bclk_divs[k] / 10)
                                                 break;
                                 if (k != ARRAY_SIZE(bclk_divs))
                                         break;
                         }
+                        if (j != ARRAY_SIZE(dac_divs))
+                                break;
                 }
-                if (j != ARRAY_SIZE(dac_divs))
-                        break;
-        }
 
-        if (i != ARRAY_SIZE(sysclk_divs)) {
-                goto configure_clock;
-        } else if (wm8960->clk_id != WM8960_SYSCLK_AUTO) {
-                dev_err(codec->dev, "failed to configure clock\n");
-                return -EINVAL;
+                if (i != ARRAY_SIZE(sysclk_divs)) {
+                        goto configure_clock;
+                } else if (wm8960->clk_id != WM8960_SYSCLK_AUTO) {
+                        dev_err(codec->dev, "failed to configure clock\n");
+                        return -EINVAL;
+                }
         }
         /* get a available pll out frequency and set pll */
         for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) {
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 1ded8811598e..2389ab47e25f 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -99,7 +99,7 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream,
                 if (ret && ret != -ENOTSUPP)
                         goto err;
         }
-
+        return 0;
 err:
         return ret;
 }