diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-02 21:20:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-03 21:35:02 +0000 |
| commit | 3a0d077f3d013811cc9f2208089d765ae79a2695 (patch) | |
| tree | 74f007a24e391787dfeee053eac4d9dccc3cdc08 /sound/soc/codecs/wm8960.c | |
| parent | 091edccf7f500837f2b3942be0d40362d25234c0 (diff) | |
| download | linux-3a0d077f3d013811cc9f2208089d765ae79a2695.tar.bz2 | |
ASoC: Remove I2C ifdefs from WM8960
The driver only supports I2C as the control interface.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8960.c')
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 3446f9c25b83..ee8d97f56bf3 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -994,7 +994,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8960 = { .reg_cache_default = wm8960_reg, }; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -1037,27 +1036,22 @@ static struct i2c_driver wm8960_i2c_driver = { .remove = __devexit_p(wm8960_i2c_remove), .id_table = wm8960_i2c_id, }; -#endif static int __init wm8960_modinit(void) { int ret = 0; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) ret = i2c_add_driver(&wm8960_i2c_driver); if (ret != 0) { printk(KERN_ERR "Failed to register WM8960 I2C driver: %d\n", ret); } -#endif return ret; } module_init(wm8960_modinit); static void __exit wm8960_exit(void) { -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) i2c_del_driver(&wm8960_i2c_driver); -#endif } module_exit(wm8960_exit); |