ASoC: Make WM8962 I2C usage unconditional
Subsystems (3)
PATCH 1/1 ASoC: Make WM8962 I2C usage unconditional
We only support I2C so no need to ifdef.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8962.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-)
sound/soc/codecs/wm8962.c +1 -13
@@ -4187,7 +4187,6 @@ static const struct regmap_config wm8962_regmap = { .cache_type = REGCACHE_RBTREE, }; -#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )static __devinit int wm8962_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {
@@ -4316,27 +4315,16 @@ static struct i2c_driver wm8962_i2c_driver = { .remove = __devexit_p(wm8962_i2c_remove), .id_table = wm8962_i2c_id, }; -#endif static int __init wm8962_modinit (void ) { -int ret; -#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 ; +return i2c_add_driver (&wm8962_i2c_driver); }module_init (wm8962_modinit); static void __exit wm8962_exit(void) { -#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )i2c_del_driver (&wm8962_i2c_driver); -#endif }module_exit (wm8962_exit);
Signature · 1 line
1.7.7.3