1 files changed, 5 insertions, 11 deletions

diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 7f567585832e..54397a508073 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -1233,7 +1233,7 @@ static const struct snd_soc_dapm_route wm5100_dapm_routes[] = {
         { "PWM2", NULL, "PWM2 Driver" },
 };
 
-static const __devinitconst struct reg_default wm5100_reva_patches[] = {
+static const struct reg_default wm5100_reva_patches[] = {
         { WM5100_AUDIO_IF_1_10, 0 },
         { WM5100_AUDIO_IF_1_11, 1 },
         { WM5100_AUDIO_IF_1_12, 2 },
@@ -1279,15 +1279,9 @@ static int wm5100_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
         case SND_SOC_DAIFMT_DSP_A:
                 mask = 0;
                 break;
-        case SND_SOC_DAIFMT_DSP_B:
-                mask = 1;
-                break;
         case SND_SOC_DAIFMT_I2S:
                 mask = 2;
                 break;
-        case SND_SOC_DAIFMT_LEFT_J:
-                mask = 3;
-                break;
         default:
                 dev_err(codec->dev, "Unsupported DAI format %d\n",
                         fmt & SND_SOC_DAIFMT_FORMAT_MASK);
@@ -2414,8 +2408,8 @@ static const unsigned int wm5100_mic_ctrl_reg[] = {
         WM5100_IN4L_CONTROL,
 };
 
-static __devinit int wm5100_i2c_probe(struct i2c_client *i2c,
-                                      const struct i2c_device_id *id)
+static int wm5100_i2c_probe(struct i2c_client *i2c,
+                            const struct i2c_device_id *id)
 {
         struct wm5100_pdata *pdata = dev_get_platdata(&i2c->dev);
         struct wm5100_priv *wm5100;
@@ -2639,7 +2633,7 @@ err:
         return ret;
 }
 
-static __devexit int wm5100_i2c_remove(struct i2c_client *i2c)
+static int wm5100_i2c_remove(struct i2c_client *i2c)
 {
         struct wm5100_priv *wm5100 = i2c_get_clientdata(i2c);
 
@@ -2717,7 +2711,7 @@ static struct i2c_driver wm5100_i2c_driver = {
                 .pm = &wm5100_pm,
         },
         .probe =    wm5100_i2c_probe,
-        .remove =   __devexit_p(wm5100_i2c_remove),
+        .remove =   wm5100_i2c_remove,
         .id_table = wm5100_i2c_id,
 };