提交 b5531205 编写于 作者: M Mark Brown

ASoC: Make I2C usage unconditional in WM8940

Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 84d0d831
...@@ -743,7 +743,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8940 = { ...@@ -743,7 +743,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8940 = {
.volatile_register = wm8940_volatile_register, .volatile_register = wm8940_volatile_register,
}; };
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static __devinit int wm8940_i2c_probe(struct i2c_client *i2c, static __devinit int wm8940_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
...@@ -786,27 +785,22 @@ static struct i2c_driver wm8940_i2c_driver = { ...@@ -786,27 +785,22 @@ static struct i2c_driver wm8940_i2c_driver = {
.remove = __devexit_p(wm8940_i2c_remove), .remove = __devexit_p(wm8940_i2c_remove),
.id_table = wm8940_i2c_id, .id_table = wm8940_i2c_id,
}; };
#endif
static int __init wm8940_modinit(void) static int __init wm8940_modinit(void)
{ {
int ret = 0; int ret = 0;
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
ret = i2c_add_driver(&wm8940_i2c_driver); ret = i2c_add_driver(&wm8940_i2c_driver);
if (ret != 0) { if (ret != 0) {
printk(KERN_ERR "Failed to register wm8940 I2C driver: %d\n", printk(KERN_ERR "Failed to register wm8940 I2C driver: %d\n",
ret); ret);
} }
#endif
return ret; return ret;
} }
module_init(wm8940_modinit); module_init(wm8940_modinit);
static void __exit wm8940_exit(void) static void __exit wm8940_exit(void)
{ {
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_del_driver(&wm8940_i2c_driver); i2c_del_driver(&wm8940_i2c_driver);
#endif
} }
module_exit(wm8940_exit); module_exit(wm8940_exit);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册