summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-07-19 09:15:38 +0800
committerMark Brown <broonie@kernel.org>2015-07-20 18:18:46 +0100
commit44251551dfca2117e42349136b871b33c8419a59 (patch)
tree714c55233521e43ba045aec56c182fd74d3d91fa
parent0443de7e7e559eab7df2566d0e46940f753db51d (diff)
downloadblackbird-op-linux-44251551dfca2117e42349136b871b33c8419a59.tar.gz
blackbird-op-linux-44251551dfca2117e42349136b871b33c8419a59.zip
ASoC: cs4349: Drop platform data support
The struct cs4349_platform_data should be defined in a public header in include/sound/ rather than in sound/soc/codecs folder. In additional, the platform data support is not properly handled in this driver so remove it now. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/cs4349.c7
-rw-r--r--sound/soc/codecs/cs4349.h7
2 files changed, 1 insertions, 13 deletions
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c
index a6604a34db34..2569010ee396 100644
--- a/sound/soc/codecs/cs4349.c
+++ b/sound/soc/codecs/cs4349.c
@@ -45,7 +45,6 @@ static const struct reg_default cs4349_reg_defaults[] = {
/* Private data for the CS4349 */
struct cs4349_private {
struct regmap *regmap;
- struct cs4349_platform_data pdata;
struct gpio_desc *reset_gpio;
unsigned int mode;
int rate;
@@ -281,8 +280,7 @@ static int cs4349_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct cs4349_private *cs4349;
- struct cs4349_platform_data *pdata = dev_get_platdata(&client->dev);
- int ret = 0;
+ int ret;
cs4349 = devm_kzalloc(&client->dev, sizeof(*cs4349), GFP_KERNEL);
if (!cs4349)
@@ -295,9 +293,6 @@ static int cs4349_i2c_probe(struct i2c_client *client,
return ret;
}
- if (pdata)
- cs4349->pdata = *pdata;
-
/* Reset the Device */
cs4349->reset_gpio = devm_gpiod_get_optional(&client->dev,
"reset", GPIOD_OUT_LOW);
diff --git a/sound/soc/codecs/cs4349.h b/sound/soc/codecs/cs4349.h
index 7effa0acec28..d58c06a25358 100644
--- a/sound/soc/codecs/cs4349.h
+++ b/sound/soc/codecs/cs4349.h
@@ -19,13 +19,6 @@
#ifndef __CS4349_H__
#define __CS4349_H__
-struct cs4349_platform_data {
-
- /* GPIO for Reset */
- unsigned int gpio_nreset;
-
-};
-
/* CS4349 registers addresses */
#define CS4349_CHIPID 0x01 /* Device and Rev ID, Read Only */
#define CS4349_MODE 0x02 /* Mode Control */
OpenPOWER on IntegriCloud