aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/adau1701.c
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2013-05-23 07:58:00 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-23 09:59:55 -0400
commit47f5b692e04a8d7989ee14591a61be26e340a17b (patch)
treecde2f9a6c1af0bc3f118c13c02d5fcaab888208b /sound/soc/codecs/adau1701.c
parentc7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff)
ASoC: adau1701: refactor firmware loading function
Pass a struct i2c_client * to adau1701_load_firmware directly to make the code more readable. Signed-off-by: Daniel Mack <zonque@gmail.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/adau1701.c')
-rw-r--r--sound/soc/codecs/adau1701.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c
index dafdbe87edeb..95e1677665e9 100644
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
@@ -180,9 +180,9 @@ static unsigned int adau1701_read(struct snd_soc_codec *codec, unsigned int reg)
180 return value; 180 return value;
181} 181}
182 182
183static int adau1701_load_firmware(struct snd_soc_codec *codec) 183static int adau1701_load_firmware(struct i2c_client *client)
184{ 184{
185 return process_sigma_firmware(codec->control_data, ADAU1701_FIRMWARE); 185 return process_sigma_firmware(client, ADAU1701_FIRMWARE);
186} 186}
187 187
188static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec, 188static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec,
@@ -455,10 +455,11 @@ static struct snd_soc_dai_driver adau1701_dai = {
455static int adau1701_probe(struct snd_soc_codec *codec) 455static int adau1701_probe(struct snd_soc_codec *codec)
456{ 456{
457 int ret; 457 int ret;
458 struct i2c_client *client = to_i2c_client(codec->dev);
458 459
459 codec->control_data = to_i2c_client(codec->dev); 460 codec->control_data = client;
460 461
461 ret = adau1701_load_firmware(codec); 462 ret = adau1701_load_firmware(client);
462 if (ret) 463 if (ret)
463 dev_warn(codec->dev, "Failed to load firmware\n"); 464 dev_warn(codec->dev, "Failed to load firmware\n");
464 465