aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8993.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-17 10:08:35 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-20 08:58:30 -0500
commit85f883933cd7353ab2227d5d2041312dce323e6b (patch)
tree1eeb10d33615312ed2cc99329097df9045e2e604 /sound/soc/codecs/wm8993.c
parent164548d3b3733b10990274e1e92848656e9d6d1e (diff)
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/codecs/wm8993.c')
-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 = {
1710 .set_bias_level = wm8993_set_bias_level, 1710 .set_bias_level = wm8993_set_bias_level,
1711}; 1711};
1712 1712
1713#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
1714static __devinit int wm8993_i2c_probe(struct i2c_client *i2c, 1713static __devinit int wm8993_i2c_probe(struct i2c_client *i2c,
1715 const struct i2c_device_id *id) 1714 const struct i2c_device_id *id)
1716{ 1715{
@@ -1838,27 +1837,22 @@ static struct i2c_driver wm8993_i2c_driver = {
1838 .remove = __devexit_p(wm8993_i2c_remove), 1837 .remove = __devexit_p(wm8993_i2c_remove),
1839 .id_table = wm8993_i2c_id, 1838 .id_table = wm8993_i2c_id,
1840}; 1839};
1841#endif
1842 1840
1843static int __init wm8993_modinit(void) 1841static int __init wm8993_modinit(void)
1844{ 1842{
1845 int ret = 0; 1843 int ret = 0;
1846#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
1847 ret = i2c_add_driver(&wm8993_i2c_driver); 1844 ret = i2c_add_driver(&wm8993_i2c_driver);
1848 if (ret != 0) { 1845 if (ret != 0) {
1849 pr_err("WM8993: Unable to register I2C driver: %d\n", 1846 pr_err("WM8993: Unable to register I2C driver: %d\n",
1850 ret); 1847 ret);
1851 } 1848 }
1852#endif
1853 return ret; 1849 return ret;
1854} 1850}
1855module_init(wm8993_modinit); 1851module_init(wm8993_modinit);
1856 1852
1857static void __exit wm8993_exit(void) 1853static void __exit wm8993_exit(void)
1858{ 1854{
1859#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
1860 i2c_del_driver(&wm8993_i2c_driver); 1855 i2c_del_driver(&wm8993_i2c_driver);
1861#endif
1862} 1856}
1863module_exit(wm8993_exit); 1857module_exit(wm8993_exit);
1864 1858