Commit 88a1b12b authored by Mark Brown's avatar Mark Brown

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

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
parent f4a10837
...@@ -2071,7 +2071,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8903 = { ...@@ -2071,7 +2071,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8903 = {
.num_dapm_routes = ARRAY_SIZE(wm8903_intercon), .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, static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
...@@ -2113,27 +2112,22 @@ static struct i2c_driver wm8903_i2c_driver = { ...@@ -2113,27 +2112,22 @@ static struct i2c_driver wm8903_i2c_driver = {
.remove = __devexit_p(wm8903_i2c_remove), .remove = __devexit_p(wm8903_i2c_remove),
.id_table = wm8903_i2c_id, .id_table = wm8903_i2c_id,
}; };
#endif
static int __init wm8903_modinit(void) static int __init wm8903_modinit(void)
{ {
int ret = 0; int ret = 0;
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
ret = i2c_add_driver(&wm8903_i2c_driver); ret = i2c_add_driver(&wm8903_i2c_driver);
if (ret != 0) { if (ret != 0) {
printk(KERN_ERR "Failed to register wm8903 I2C driver: %d\n", printk(KERN_ERR "Failed to register wm8903 I2C driver: %d\n",
ret); ret);
} }
#endif
return ret; return ret;
} }
module_init(wm8903_modinit); module_init(wm8903_modinit);
static void __exit wm8903_exit(void) static void __exit wm8903_exit(void)
{ {
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_del_driver(&wm8903_i2c_driver); i2c_del_driver(&wm8903_i2c_driver);
#endif
} }
module_exit(wm8903_exit); module_exit(wm8903_exit);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment