diff options
| author | Mark Brown | 2012-01-10 19:53:49 +0100 |
|---|---|---|
| committer | Mark Brown | 2012-01-20 14:58:27 +0100 |
| commit | 291d64be3137b9bb709ce3bc72dbe2ca6b647466 (patch) | |
| tree | 896af3b9832f6d00bbdd3d49ffa050b7beb0f306 /sound/soc/codecs/wm8962.c | |
| parent | ASoC: CQ93VC: remove machine specific header file inclusion from codec driver (diff) | |
| download | kernel-qcow2-linux-291d64be3137b9bb709ce3bc72dbe2ca6b647466.tar.gz kernel-qcow2-linux-291d64be3137b9bb709ce3bc72dbe2ca6b647466.tar.xz kernel-qcow2-linux-291d64be3137b9bb709ce3bc72dbe2ca6b647466.zip | |
ASoC: Make WM8962 I2C usage unconditional
We only support I2C so no need to ifdef.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 296de4e30d26..63e908ccbf88 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -4155,7 +4155,6 @@ static const struct regmap_config wm8962_regmap = { .cache_type = REGCACHE_RBTREE, }; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) static __devinit int wm8962_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -4284,27 +4283,16 @@ static struct i2c_driver wm8962_i2c_driver = { .remove = __devexit_p(wm8962_i2c_remove), .id_table = wm8962_i2c_id, }; -#endif static int __init wm8962_modinit(void) { - int ret; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) - ret = i2c_add_driver(&wm8962_i2c_driver); - if (ret != 0) { - printk(KERN_ERR "Failed to register WM8962 I2C driver: %d\n", - ret); - } -#endif - return 0; + return i2c_add_driver(&wm8962_i2c_driver); } module_init(wm8962_modinit); static void __exit wm8962_exit(void) { -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) i2c_del_driver(&wm8962_i2c_driver); -#endif } module_exit(wm8962_exit); |