ASoC: Remove unused "control_data" field of struct cs4270_private
The control_data field is used to initialize the codec's control_data field, but since this is also done by the snd-soc-cache core, the redundant assignment can be removed and the field can be dropped. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Родитель
44cb209d33
Коммит
217069ea9a
|
@ -128,7 +128,6 @@ static const char *supply_names[] = {
|
||||||
/* Private data for the CS4270 */
|
/* Private data for the CS4270 */
|
||||||
struct cs4270_private {
|
struct cs4270_private {
|
||||||
enum snd_soc_control_type control_type;
|
enum snd_soc_control_type control_type;
|
||||||
void *control_data;
|
|
||||||
unsigned int mclk; /* Input frequency of the MCLK pin */
|
unsigned int mclk; /* Input frequency of the MCLK pin */
|
||||||
unsigned int mode; /* The mode (I2S or left-justified) */
|
unsigned int mode; /* The mode (I2S or left-justified) */
|
||||||
unsigned int slave_mode;
|
unsigned int slave_mode;
|
||||||
|
@ -490,8 +489,6 @@ static int cs4270_probe(struct snd_soc_codec *codec)
|
||||||
struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec);
|
struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec);
|
||||||
int i, ret;
|
int i, ret;
|
||||||
|
|
||||||
codec->control_data = cs4270->control_data;
|
|
||||||
|
|
||||||
/* Tell ASoC what kind of I/O to use to read the registers. ASoC will
|
/* Tell ASoC what kind of I/O to use to read the registers. ASoC will
|
||||||
* then do the I2C transactions itself.
|
* then do the I2C transactions itself.
|
||||||
*/
|
*/
|
||||||
|
@ -604,7 +601,7 @@ static int cs4270_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg)
|
||||||
static int cs4270_soc_resume(struct snd_soc_codec *codec)
|
static int cs4270_soc_resume(struct snd_soc_codec *codec)
|
||||||
{
|
{
|
||||||
struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec);
|
struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec);
|
||||||
struct i2c_client *i2c_client = codec->control_data;
|
struct i2c_client *i2c_client = to_i2c_client(codec->dev);
|
||||||
int reg;
|
int reg;
|
||||||
|
|
||||||
regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies),
|
regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies),
|
||||||
|
@ -690,7 +687,6 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client,
|
||||||
}
|
}
|
||||||
|
|
||||||
i2c_set_clientdata(i2c_client, cs4270);
|
i2c_set_clientdata(i2c_client, cs4270);
|
||||||
cs4270->control_data = i2c_client;
|
|
||||||
cs4270->control_type = SND_SOC_I2C;
|
cs4270->control_type = SND_SOC_I2C;
|
||||||
|
|
||||||
ret = snd_soc_register_codec(&i2c_client->dev,
|
ret = snd_soc_register_codec(&i2c_client->dev,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче