diff options
-rw-r--r-- | sound/soc/codecs/cs4270.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 6cc8678f49f3..5830c934a1d1 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c | |||
@@ -128,7 +128,6 @@ static const char *supply_names[] = { | |||
128 | /* Private data for the CS4270 */ | 128 | /* Private data for the CS4270 */ |
129 | struct cs4270_private { | 129 | struct cs4270_private { |
130 | enum snd_soc_control_type control_type; | 130 | enum snd_soc_control_type control_type; |
131 | void *control_data; | ||
132 | unsigned int mclk; /* Input frequency of the MCLK pin */ | 131 | unsigned int mclk; /* Input frequency of the MCLK pin */ |
133 | unsigned int mode; /* The mode (I2S or left-justified) */ | 132 | unsigned int mode; /* The mode (I2S or left-justified) */ |
134 | unsigned int slave_mode; | 133 | unsigned int slave_mode; |
@@ -490,8 +489,6 @@ static int cs4270_probe(struct snd_soc_codec *codec) | |||
490 | struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec); | 489 | struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec); |
491 | int i, ret; | 490 | int i, ret; |
492 | 491 | ||
493 | codec->control_data = cs4270->control_data; | ||
494 | |||
495 | /* Tell ASoC what kind of I/O to use to read the registers. ASoC will | 492 | /* Tell ASoC what kind of I/O to use to read the registers. ASoC will |
496 | * then do the I2C transactions itself. | 493 | * then do the I2C transactions itself. |
497 | */ | 494 | */ |
@@ -604,7 +601,7 @@ static int cs4270_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg) | |||
604 | static int cs4270_soc_resume(struct snd_soc_codec *codec) | 601 | static int cs4270_soc_resume(struct snd_soc_codec *codec) |
605 | { | 602 | { |
606 | struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec); | 603 | struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec); |
607 | struct i2c_client *i2c_client = codec->control_data; | 604 | struct i2c_client *i2c_client = to_i2c_client(codec->dev); |
608 | int reg; | 605 | int reg; |
609 | 606 | ||
610 | regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies), | 607 | regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies), |
@@ -690,7 +687,6 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, | |||
690 | } | 687 | } |
691 | 688 | ||
692 | i2c_set_clientdata(i2c_client, cs4270); | 689 | i2c_set_clientdata(i2c_client, cs4270); |
693 | cs4270->control_data = i2c_client; | ||
694 | cs4270->control_type = SND_SOC_I2C; | 690 | cs4270->control_type = SND_SOC_I2C; |
695 | 691 | ||
696 | ret = snd_soc_register_codec(&i2c_client->dev, | 692 | ret = snd_soc_register_codec(&i2c_client->dev, |