提交 85f88393 编写于 作者: M Mark Brown

ASoC: Make WM8993 I2C usage unconditional

The WM8993 only supports I2C so don't ifdef the I2C support in the driver.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 164548d3
...@@ -1710,7 +1710,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8993 = { ...@@ -1710,7 +1710,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8993 = {
.set_bias_level = wm8993_set_bias_level, .set_bias_level = wm8993_set_bias_level,
}; };
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static __devinit int wm8993_i2c_probe(struct i2c_client *i2c, static __devinit int wm8993_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
...@@ -1838,27 +1837,22 @@ static struct i2c_driver wm8993_i2c_driver = { ...@@ -1838,27 +1837,22 @@ static struct i2c_driver wm8993_i2c_driver = {
.remove = __devexit_p(wm8993_i2c_remove), .remove = __devexit_p(wm8993_i2c_remove),
.id_table = wm8993_i2c_id, .id_table = wm8993_i2c_id,
}; };
#endif
static int __init wm8993_modinit(void) static int __init wm8993_modinit(void)
{ {
int ret = 0; int ret = 0;
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
ret = i2c_add_driver(&wm8993_i2c_driver); ret = i2c_add_driver(&wm8993_i2c_driver);
if (ret != 0) { if (ret != 0) {
pr_err("WM8993: Unable to register I2C driver: %d\n", pr_err("WM8993: Unable to register I2C driver: %d\n",
ret); ret);
} }
#endif
return ret; return ret;
} }
module_init(wm8993_modinit); module_init(wm8993_modinit);
static void __exit wm8993_exit(void) static void __exit wm8993_exit(void)
{ {
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_del_driver(&wm8993_i2c_driver); i2c_del_driver(&wm8993_i2c_driver);
#endif
} }
module_exit(wm8993_exit); module_exit(wm8993_exit);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册