Merge remote-tracking branches 'asoc/topic/wm0010', 'asoc/topic/wm5100', 'asoc/topic...

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

diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 4c10cd88c1af66a1a54b168c34844c190e077b9d..c2cdcae18ff620e611a5fdda23f0355ca13bd58d 100644 (file)
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -1247,7 +1247,7 @@ static const struct snd_soc_dapm_route wm5100_dapm_routes[] = {
        { "PWM2", NULL, "PWM2 Driver" },
 };
 
-static const struct reg_default wm5100_reva_patches[] = {
+static const struct reg_sequence wm5100_reva_patches[] = {
        { WM5100_AUDIO_IF_1_10, 0 },
        { WM5100_AUDIO_IF_1_11, 1 },
        { WM5100_AUDIO_IF_1_12, 2 },
@@ -1408,7 +1408,7 @@ static int wm5100_hw_params(struct snd_pcm_substream *substream,
        base = dai->driver->base;
 
        /* Data sizes if not using TDM */
-       wl = snd_pcm_format_width(params_format(params));
+       wl = params_width(params);
        if (wl < 0)
                return wl;
        fl = snd_soc_params_to_frame_size(params);
@@ -2570,13 +2570,11 @@ static int wm5100_i2c_probe(struct i2c_client *i2c,
 
                if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING))
                        ret = request_threaded_irq(i2c->irq, NULL,
-                                                  wm5100_edge_irq,
-                                                  irq_flags | IRQF_ONESHOT,
+                                                  wm5100_edge_irq, irq_flags,
                                                   "wm5100", wm5100);
                else
                        ret = request_threaded_irq(i2c->irq, NULL, wm5100_irq,
-                                                  irq_flags | IRQF_ONESHOT,
-                                                  "wm5100",
+                                                  irq_flags, "wm5100",
                                                   wm5100);
 
                if (ret != 0) {
@@ -2708,7 +2706,7 @@ static int wm5100_runtime_resume(struct device *dev)
 }
 #endif
 
-static struct dev_pm_ops wm5100_pm = {
+static const struct dev_pm_ops wm5100_pm = {
        SET_RUNTIME_PM_OPS(wm5100_runtime_suspend, wm5100_runtime_resume,
                           NULL)
 };
@@ -2722,7 +2720,6 @@ MODULE_DEVICE_TABLE(i2c, wm5100_i2c_id);
 static struct i2c_driver wm5100_i2c_driver = {
        .driver = {
                .name = "wm5100",
-               .owner = THIS_MODULE,
                .pm = &wm5100_pm,
        },
        .probe =    wm5100_i2c_probe,