summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/ak4642.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2010-09-16 13:06:40 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-16 14:14:56 +0100
commit0ce75aa4fe845a8dbbf949cb31e15c06a503b860 (patch)
treec9c6b8095fa73d74c5fb4e28acfb47968a5a4c88 /sound/soc/codecs/ak4642.c
parent19c7ac27a1e6a37f5fb5810ad8ac780c62a204c4 (diff)
downloadop-kernel-dev-0ce75aa4fe845a8dbbf949cb31e15c06a503b860.zip
op-kernel-dev-0ce75aa4fe845a8dbbf949cb31e15c06a503b860.tar.gz
ASoC: ak4642: code clean up
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/ak4642.c')
-rw-r--r--sound/soc/codecs/ak4642.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index c84cc9c..a95ff4f 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -422,7 +422,7 @@ static int ak4642_probe(struct snd_soc_codec *codec)
dev_info(codec->dev, "AK4642 Audio Codec %s", AK4642_VERSION);
codec->hw_write = (hw_write_t)i2c_master_send;
- codec->control_data = ak4642->control_data;
+ codec->control_data = ak4642->control_data;
snd_soc_add_controls(codec, ak4642_snd_controls,
ARRAY_SIZE(ak4642_snd_controls));
@@ -431,12 +431,12 @@ static int ak4642_probe(struct snd_soc_codec *codec)
}
static struct snd_soc_codec_driver soc_codec_dev_ak4642 = {
- .probe = ak4642_probe,
- .resume = ak4642_resume,
- .read = ak4642_read_reg_cache,
- .write = ak4642_write,
- .reg_cache_size = ARRAY_SIZE(ak4642_reg),
- .reg_word_size = sizeof(u8),
+ .probe = ak4642_probe,
+ .resume = ak4642_resume,
+ .read = ak4642_read_reg_cache,
+ .write = ak4642_write,
+ .reg_cache_size = ARRAY_SIZE(ak4642_reg),
+ .reg_word_size = sizeof(u8),
.reg_cache_default = ak4642_reg,
};
@@ -448,7 +448,7 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c,
int ret;
ak4642 = kzalloc(sizeof(struct ak4642_priv), GFP_KERNEL);
- if (ak4642 == NULL)
+ if (!ak4642)
return -ENOMEM;
i2c_set_clientdata(i2c, ak4642);
@@ -481,9 +481,9 @@ static struct i2c_driver ak4642_i2c_driver = {
.name = "ak4642-codec",
.owner = THIS_MODULE,
},
- .probe = ak4642_i2c_probe,
- .remove = __devexit_p(ak4642_i2c_remove),
- .id_table = ak4642_i2c_id,
+ .probe = ak4642_i2c_probe,
+ .remove = __devexit_p(ak4642_i2c_remove),
+ .id_table = ak4642_i2c_id,
};
#endif
OpenPOWER on IntegriCloud