Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-next

diff --cc sound/soc/codecs/tpa6130a2.c
index 8d75aa152c8cd29dab7133791db83955d5a6bd14,ec78073e35882129e83eaed5807140df0e493f60..c58bee8346cef2223e4b0cb5b15cbc76991ccca5
--- 1/sound/soc/codecs/tpa6130a2.c
--- 2/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@@ -455,16 -451,9 +451,9 @@@ err_gpio
        return ret;
  }
  
 -static int __devexit tpa6130a2_remove(struct i2c_client *client)
 +static int tpa6130a2_remove(struct i2c_client *client)
  {
-       struct tpa6130a2_data *data = i2c_get_clientdata(client);
- 
        tpa6130a2_power(0);
- 
-       if (data->power_gpio >= 0)
-               gpio_free(data->power_gpio);
- 
-       regulator_put(data->supply);
        tpa6130a2_client = NULL;
  
        return 0;