From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 15 Dec 2012 14:56:46 +0000 (+0900)
Subject: Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-next
X-Git-Tag: firefly_0821_release~3680^2~1370^2~5^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8246b5b03ef4ab6f29ad8edad859c74b124323cb;p=firefly-linux-kernel-4.4.55.git

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

8246b5b03ef4ab6f29ad8edad859c74b124323cb
diff --cc sound/soc/codecs/tpa6130a2.c
index 8d75aa152c8c,ec78073e3588..c58bee8346ce
--- a/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;