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

ASoC: Make WM8962 I2C usage unconditional

Browse Source 
We only support I2C so no need to ifdef.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown
2012-01-10 10:53:49 -08:00
parent 2e932f2940
commit 291d64be31
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/codecs/wm8962.c
View File

@@ -4155,7 +4155,6 @@ static const struct regmap_config wm8962_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static __devinit int wm8962_i2c_probe(struct i2c_client *i2c, static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
@@ -4284,27 +4283,16 @@ static struct i2c_driver wm8962_i2c_driver = {
.remove = __devexit_p(wm8962_i2c_remove), .remove = __devexit_p(wm8962_i2c_remove),
.id_table = wm8962_i2c_id, .id_table = wm8962_i2c_id,
}; };
#endif
static int __init wm8962_modinit(void) static int __init wm8962_modinit(void)
{ {
int ret; return i2c_add_driver(&wm8962_i2c_driver);
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
ret = i2c_add_driver(&wm8962_i2c_driver);
if (ret != 0) {
printk(KERN_ERR "Failed to register WM8962 I2C driver: %d\n",
ret);
}
#endif
return 0;
} }
module_init(wm8962_modinit); module_init(wm8962_modinit);
static void __exit wm8962_exit(void) static void __exit wm8962_exit(void)
{ {
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_del_driver(&wm8962_i2c_driver); i2c_del_driver(&wm8962_i2c_driver);
#endif
} }
module_exit(wm8962_exit); module_exit(wm8962_exit);