p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Axel Lin 2015-07-19 09:15:38 +08:00 committed by Mark Brown
parent 0443de7e7e
commit 44251551df
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/codecs/cs4349.c
View File

@ -45,7 +45,6 @@ static const struct reg_default cs4349_reg_defaults[] = {
/* Private data for the CS4349 */ /* Private data for the CS4349 */
struct cs4349_private { struct cs4349_private {
struct regmap *regmap; struct regmap *regmap;
struct cs4349_platform_data pdata;
struct gpio_desc *reset_gpio; struct gpio_desc *reset_gpio;
unsigned int mode; unsigned int mode;
int rate; int rate;
@ -281,8 +280,7 @@ static int cs4349_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct cs4349_private *cs4349; struct cs4349_private *cs4349;
struct cs4349_platform_data *pdata = dev_get_platdata(&client->dev); int ret;
int ret = 0;
cs4349 = devm_kzalloc(&client->dev, sizeof(*cs4349), GFP_KERNEL); cs4349 = devm_kzalloc(&client->dev, sizeof(*cs4349), GFP_KERNEL);
if (!cs4349) if (!cs4349)
@ -295,9 +293,6 @@ static int cs4349_i2c_probe(struct i2c_client *client,
return ret; return ret;
} }
if (pdata)
cs4349->pdata = *pdata;
/* Reset the Device */ /* Reset the Device */
cs4349->reset_gpio = devm_gpiod_get_optional(&client->dev, cs4349->reset_gpio = devm_gpiod_get_optional(&client->dev,
"reset", GPIOD_OUT_LOW); "reset", GPIOD_OUT_LOW);

7
sound/soc/codecs/cs4349.h
View File

@ -19,13 +19,6 @@
#ifndef __CS4349_H__ #ifndef __CS4349_H__
#define __CS4349_H__ #define __CS4349_H__
struct cs4349_platform_data {
/* GPIO for Reset */
unsigned int gpio_nreset;
};
/* CS4349 registers addresses */ /* CS4349 registers addresses */
#define CS4349_CHIPID 0x01 /* Device and Rev ID, Read Only */ #define CS4349_CHIPID 0x01 /* Device and Rev ID, Read Only */
#define CS4349_MODE 0x02 /* Mode Control */ #define CS4349_MODE 0x02 /* Mode Control */