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 --- sound/soc/codecs/cs4349.c | 7 +------ sound/soc/codecs/cs4349.h | 7 ------- 2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index eb55889..7befc05 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; @@ -283,8 +282,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) @@ -297,9 +295,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 7effa0a..d58c06a 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 */