From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 2 Dec 2011 18:21:52 +0000 (+0000)
Subject: ASoC: WM8903 only supports I2C so don't ifdef it
X-Git-Tag: next-20111205~44^2~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=88a1b12b9c70d1b2ea4d11bdfa6ae65c9570909b;p=karo-tx-linux.git

ASoC: WM8903 only supports I2C so don't ifdef it

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
---

diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 76c7c2bd3cd1..745681258eda 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -2071,7 +2071,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8903 = {
 	.num_dapm_routes = ARRAY_SIZE(wm8903_intercon),
 };
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
 				      const struct i2c_device_id *id)
 {
@@ -2113,27 +2112,22 @@ static struct i2c_driver wm8903_i2c_driver = {
 	.remove =   __devexit_p(wm8903_i2c_remove),
 	.id_table = wm8903_i2c_id,
 };
-#endif
 
 static int __init wm8903_modinit(void)
 {
 	int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	ret = i2c_add_driver(&wm8903_i2c_driver);
 	if (ret != 0) {
 		printk(KERN_ERR "Failed to register wm8903 I2C driver: %d\n",
 		       ret);
 	}
-#endif
 	return ret;
 }
 module_init(wm8903_modinit);
 
 static void __exit wm8903_exit(void)
 {
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	i2c_del_driver(&wm8903_i2c_driver);
-#endif
 }
 module_exit(wm8903_exit);