summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8971.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-29 14:59:39 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-20 17:58:21 +0400
commit542cc361de509798b311999ada07ebf2bd5673cf (patch)
tree250c0b4b7fbecbf8804a63c77c8707c3fa9f1afa /sound/soc/codecs/wm8971.c
parentd3398ff05907167f463e119421b053ce043741d1 (diff)
downloadlinux-542cc361de509798b311999ada07ebf2bd5673cf.tar.xz
ASoC: Make WM8971 I2C usage unconditional
The driver only supports I2C so no need to worry about SPI only systems. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8971.c')
-rw-r--r--sound/soc/codecs/wm8971.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index 4af893601f00..a1db1509dcf2 100644
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -688,7 +688,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8971 = {
.reg_cache_default = wm8971_reg,
};
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static __devinit int wm8971_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
@@ -731,27 +730,22 @@ static struct i2c_driver wm8971_i2c_driver = {
.remove = __devexit_p(wm8971_i2c_remove),
.id_table = wm8971_i2c_id,
};
-#endif
static int __init wm8971_modinit(void)
{
int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
ret = i2c_add_driver(&wm8971_i2c_driver);
if (ret != 0) {
printk(KERN_ERR "Failed to register WM8971 I2C driver: %d\n",
ret);
}
-#endif
return ret;
}
module_init(wm8971_modinit);
static void __exit wm8971_exit(void)
{
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_del_driver(&wm8971_i2c_driver);
-#endif
}
module_exit(wm8971_exit);