diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-02 16:20:37 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-03 16:35:02 -0500 |
commit | 3a0d077f3d013811cc9f2208089d765ae79a2695 (patch) | |
tree | 74f007a24e391787dfeee053eac4d9dccc3cdc08 /sound | |
parent | 091edccf7f500837f2b3942be0d40362d25234c0 (diff) |
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')
-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 = { | |||
994 | .reg_cache_default = wm8960_reg, | 994 | .reg_cache_default = wm8960_reg, |
995 | }; | 995 | }; |
996 | 996 | ||
997 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | ||
998 | static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, | 997 | static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, |
999 | const struct i2c_device_id *id) | 998 | const struct i2c_device_id *id) |
1000 | { | 999 | { |
@@ -1037,27 +1036,22 @@ static struct i2c_driver wm8960_i2c_driver = { | |||
1037 | .remove = __devexit_p(wm8960_i2c_remove), | 1036 | .remove = __devexit_p(wm8960_i2c_remove), |
1038 | .id_table = wm8960_i2c_id, | 1037 | .id_table = wm8960_i2c_id, |
1039 | }; | 1038 | }; |
1040 | #endif | ||
1041 | 1039 | ||
1042 | static int __init wm8960_modinit(void) | 1040 | static int __init wm8960_modinit(void) |
1043 | { | 1041 | { |
1044 | int ret = 0; | 1042 | int ret = 0; |
1045 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | ||
1046 | ret = i2c_add_driver(&wm8960_i2c_driver); | 1043 | ret = i2c_add_driver(&wm8960_i2c_driver); |
1047 | if (ret != 0) { | 1044 | if (ret != 0) { |
1048 | printk(KERN_ERR "Failed to register WM8960 I2C driver: %d\n", | 1045 | printk(KERN_ERR "Failed to register WM8960 I2C driver: %d\n", |
1049 | ret); | 1046 | ret); |
1050 | } | 1047 | } |
1051 | #endif | ||
1052 | return ret; | 1048 | return ret; |
1053 | } | 1049 | } |
1054 | module_init(wm8960_modinit); | 1050 | module_init(wm8960_modinit); |
1055 | 1051 | ||
1056 | static void __exit wm8960_exit(void) | 1052 | static void __exit wm8960_exit(void) |
1057 | { | 1053 | { |
1058 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | ||
1059 | i2c_del_driver(&wm8960_i2c_driver); | 1054 | i2c_del_driver(&wm8960_i2c_driver); |
1060 | #endif | ||
1061 | } | 1055 | } |
1062 | module_exit(wm8960_exit); | 1056 | module_exit(wm8960_exit); |
1063 | 1057 | ||