Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/xtensa' and 'asoc...

[karo-tx-linux.git] / sound / soc / codecs / wm8996.c

diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index 3dd063f682b29f6fa4e1bb1dbdda1a3305c750bc..f7ccd9fc5808e56950225d2ccccd7a8ad8d2de62 100644 (file)
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -117,7 +117,7 @@ WM8996_REGULATOR_EVENT(0)
 WM8996_REGULATOR_EVENT(1)
 WM8996_REGULATOR_EVENT(2)
 
-static struct reg_default wm8996_reg[] = {
+static const struct reg_default wm8996_reg[] = {
        { WM8996_POWER_MANAGEMENT_1, 0x0 },
        { WM8996_POWER_MANAGEMENT_2, 0x0 },
        { WM8996_POWER_MANAGEMENT_3, 0x0 },
@@ -1780,7 +1780,7 @@ static int wm8996_hw_params(struct snd_pcm_substream *substream,
        wm8996->rx_rate[dai->id] = params_rate(params);
 
        /* Needs looking at for TDM */
-       bits = snd_pcm_format_width(params_format(params));
+       bits = params_width(params);
        if (bits < 0)
                return bits;
        aifdata |= (bits << WM8996_AIF1TX_WL_SHIFT) | bits;
@@ -2647,12 +2647,10 @@ static int wm8996_probe(struct snd_soc_codec *codec)
                if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING))
                        ret = request_threaded_irq(i2c->irq, NULL,
                                                   wm8996_edge_irq,
-                                                  irq_flags | IRQF_ONESHOT,
-                                                  "wm8996", codec);
+                                                  irq_flags, "wm8996", codec);
                else
                        ret = request_threaded_irq(i2c->irq, NULL, wm8996_irq,
-                                                  irq_flags | IRQF_ONESHOT,
-                                                  "wm8996", codec);
+                                                  irq_flags, "wm8996", codec);
 
                if (ret == 0) {
                        /* Unmask the interrupt */
@@ -3100,7 +3098,6 @@ MODULE_DEVICE_TABLE(i2c, wm8996_i2c_id);
 static struct i2c_driver wm8996_i2c_driver = {
        .driver = {
                .name = "wm8996",
-               .owner = THIS_MODULE,
        },
        .probe =    wm8996_i2c_probe,
        .remove =   wm8996_i2c_remove,