diff options
| author | Mark Brown | 2011-11-21 13:11:37 +0100 |
|---|---|---|
| committer | Mark Brown | 2011-11-22 12:59:50 +0100 |
| commit | 12a7a709a09aac117b630264cdd526e20d4d0ce2 (patch) | |
| tree | a60d3c50f0e1265b901e49ec98a3428be4bfde7b /sound/soc/codecs/tlv320aic3x.c | |
| parent | ASoC: Remove WM5100 DSP memory windows from register default data (diff) | |
| download | kernel-qcow2-linux-12a7a709a09aac117b630264cdd526e20d4d0ce2.tar.gz kernel-qcow2-linux-12a7a709a09aac117b630264cdd526e20d4d0ce2.tar.xz kernel-qcow2-linux-12a7a709a09aac117b630264cdd526e20d4d0ce2.zip | |
ASoC: Remove conditional I2C usage from tlv320aic3x driver
The driver only supports I2C so doesn't need to do things conditionally.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 14cb5534ce8b..2e2bf18253c8 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1481,7 +1481,6 @@ static struct snd_soc_codec_driver soc_codec_dev_aic3x = { .resume = aic3x_resume, }; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) /* * AIC3X 2 wire address can be up to 4 devices with device addresses * 0x18, 0x19, 0x1A, 0x1B @@ -1548,27 +1547,22 @@ static struct i2c_driver aic3x_i2c_driver = { .remove = aic3x_i2c_remove, .id_table = aic3x_i2c_id, }; -#endif static int __init aic3x_modinit(void) { int ret = 0; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) ret = i2c_add_driver(&aic3x_i2c_driver); if (ret != 0) { printk(KERN_ERR "Failed to register TLV320AIC3x I2C driver: %d\n", ret); } -#endif return ret; } module_init(aic3x_modinit); static void __exit aic3x_exit(void) { -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) i2c_del_driver(&aic3x_i2c_driver); -#endif } module_exit(aic3x_exit); |