lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Make I2C usage unconditional in WM8955

Browse Source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown
2011-12-29 21:21:49 +00:00
parent 42dad0d84a
commit 1e9c898df0
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/wm8955.c
View File

@@ -1001,7 +1001,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8955 = {
.reg_cache_default = wm8955_reg, .reg_cache_default = wm8955_reg,
}; };
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static __devinit int wm8955_i2c_probe(struct i2c_client *i2c, static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
@@ -1044,27 +1043,22 @@ static struct i2c_driver wm8955_i2c_driver = {
.remove = __devexit_p(wm8955_i2c_remove), .remove = __devexit_p(wm8955_i2c_remove),
.id_table = wm8955_i2c_id, .id_table = wm8955_i2c_id,
}; };
#endif
static int __init wm8955_modinit(void) static int __init wm8955_modinit(void)
{ {
int ret = 0; int ret = 0;
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
ret = i2c_add_driver(&wm8955_i2c_driver); ret = i2c_add_driver(&wm8955_i2c_driver);
if (ret != 0) { if (ret != 0) {
printk(KERN_ERR "Failed to register WM8955 I2C driver: %d\n", printk(KERN_ERR "Failed to register WM8955 I2C driver: %d\n",
ret); ret);
} }
#endif
return ret; return ret;
} }
module_init(wm8955_modinit); module_init(wm8955_modinit);
static void __exit wm8955_exit(void) static void __exit wm8955_exit(void)
{ {
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_del_driver(&wm8955_i2c_driver); i2c_del_driver(&wm8955_i2c_driver);
#endif
} }
module_exit(wm8955_exit); module_exit(wm8955_exit);