summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-17 16:08:35 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-20 14:58:30 +0100
commit85f883933cd7353ab2227d5d2041312dce323e6b (patch)
tree1eeb10d33615312ed2cc99329097df9045e2e604 /sound/soc
parentASoC: Implement basic WM8993 interrupt support (diff)
downloadlinux-85f883933cd7353ab2227d5d2041312dce323e6b.tar.xz
linux-85f883933cd7353ab2227d5d2041312dce323e6b.zip
ASoC: Make WM8993 I2C usage unconditional
The WM8993 only supports I2C so don't ifdef the I2C support in the driver. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8993.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index eca93521124c..5502543b8a26 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1710,7 +1710,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8993 = {
.set_bias_level = wm8993_set_bias_level,
};
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static __devinit int wm8993_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
@@ -1838,27 +1837,22 @@ static struct i2c_driver wm8993_i2c_driver = {
.remove = __devexit_p(wm8993_i2c_remove),
.id_table = wm8993_i2c_id,
};
-#endif
static int __init wm8993_modinit(void)
{
int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
ret = i2c_add_driver(&wm8993_i2c_driver);
if (ret != 0) {
pr_err("WM8993: Unable to register I2C driver: %d\n",
ret);
}
-#endif
return ret;
}
module_init(wm8993_modinit);
static void __exit wm8993_exit(void)
{
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_del_driver(&wm8993_i2c_driver);
-#endif
}
module_exit(wm8993_exit);