Merge branch 'fixes-gpio-to-irq' into fixes

[deliverable/linux.git] / sound / soc / codecs / wm8971.c

diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index 4af893601f00e2da9c33101de59ed42ff949904b..28fe59e3ce011c4d96eac242276214b91d3d9c86 100644 (file)
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -252,7 +252,7 @@ static const struct snd_soc_dapm_widget wm8971_dapm_widgets[] = {
        SND_SOC_DAPM_INPUT("MIC"),
 };
 
-static const struct snd_soc_dapm_route audio_map[] = {
+static const struct snd_soc_dapm_route wm8971_dapm_routes[] = {
        /* left mixer */
        {"Left Mixer", "Playback Switch", "Left DAC"},
        {"Left Mixer", "Left Bypass Switch", "Left Line Mux"},
@@ -329,17 +329,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
        {"Right ADC", NULL, "Right ADC Mux"},
 };
 
-static int wm8971_add_widgets(struct snd_soc_codec *codec)
-{
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-       snd_soc_dapm_new_controls(dapm, wm8971_dapm_widgets,
-                                 ARRAY_SIZE(wm8971_dapm_widgets));
-       snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
-       return 0;
-}
-
 struct _coeff_div {
        u32 mclk;
        u32 rate;
@@ -659,10 +648,6 @@ static int wm8971_probe(struct snd_soc_codec *codec)
        snd_soc_update_bits(codec, WM8971_LINVOL, 0x0100, 0x0100);
        snd_soc_update_bits(codec, WM8971_RINVOL, 0x0100, 0x0100);
 
-       snd_soc_add_controls(codec, wm8971_snd_controls,
-                               ARRAY_SIZE(wm8971_snd_controls));
-       wm8971_add_widgets(codec);
-
        return ret;
 }
 
@@ -686,16 +671,23 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8971 = {
        .reg_cache_size = ARRAY_SIZE(wm8971_reg),
        .reg_word_size = sizeof(u16),
        .reg_cache_default = wm8971_reg,
+
+       .controls = wm8971_snd_controls,
+       .num_controls = ARRAY_SIZE(wm8971_snd_controls),
+       .dapm_widgets = wm8971_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(wm8971_dapm_widgets),
+       .dapm_routes = wm8971_dapm_routes,
+       .num_dapm_routes = ARRAY_SIZE(wm8971_dapm_routes),
 };
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8971_i2c_probe(struct i2c_client *i2c,
                                      const struct i2c_device_id *id)
 {
        struct wm8971_priv *wm8971;
        int ret;
 
-       wm8971 = kzalloc(sizeof(struct wm8971_priv), GFP_KERNEL);
+       wm8971 = devm_kzalloc(&i2c->dev, sizeof(struct wm8971_priv),
+                             GFP_KERNEL);
        if (wm8971 == NULL)
                return -ENOMEM;
 
@@ -704,15 +696,13 @@ static __devinit int wm8971_i2c_probe(struct i2c_client *i2c,
 
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8971, &wm8971_dai, 1);
-       if (ret < 0)
-               kfree(wm8971);
+
        return ret;
 }
 
 static __devexit int wm8971_i2c_remove(struct i2c_client *client)
 {
        snd_soc_unregister_codec(&client->dev);
-       kfree(i2c_get_clientdata(client));
        return 0;
 }
 
@@ -731,27 +721,22 @@ static struct i2c_driver wm8971_i2c_driver = {
        .remove =   __devexit_p(wm8971_i2c_remove),
        .id_table = wm8971_i2c_id,
 };
-#endif
 
 static int __init wm8971_modinit(void)
 {
        int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
        ret = i2c_add_driver(&wm8971_i2c_driver);
        if (ret != 0) {
                printk(KERN_ERR "Failed to register WM8971 I2C driver: %d\n",
                       ret);
        }
-#endif
        return ret;
 }
 module_init(wm8971_modinit);
 
 static void __exit wm8971_exit(void)
 {
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
        i2c_del_driver(&wm8971_i2c_driver);
-#endif
 }
 module_exit(wm8971_exit);