aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8903.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-02 13:21:52 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-03 05:59:44 -0500
commit88a1b12b9c70d1b2ea4d11bdfa6ae65c9570909b (patch)
tree61957562f5ec1fe94d5309221c4025c4f10610c8 /sound/soc/codecs/wm8903.c
parentf4a10837c9dd473cd615766cf38f33a3c1f745cf (diff)
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>
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
-rw-r--r--sound/soc/codecs/wm8903.c6
1 files changed, 0 insertions, 6 deletions
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 = {
2071 .num_dapm_routes = ARRAY_SIZE(wm8903_intercon), 2071 .num_dapm_routes = ARRAY_SIZE(wm8903_intercon),
2072}; 2072};
2073 2073
2074#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
2075static __devinit int wm8903_i2c_probe(struct i2c_client *i2c, 2074static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
2076 const struct i2c_device_id *id) 2075 const struct i2c_device_id *id)
2077{ 2076{
@@ -2113,27 +2112,22 @@ static struct i2c_driver wm8903_i2c_driver = {
2113 .remove = __devexit_p(wm8903_i2c_remove), 2112 .remove = __devexit_p(wm8903_i2c_remove),
2114 .id_table = wm8903_i2c_id, 2113 .id_table = wm8903_i2c_id,
2115}; 2114};
2116#endif
2117 2115
2118static int __init wm8903_modinit(void) 2116static int __init wm8903_modinit(void)
2119{ 2117{
2120 int ret = 0; 2118 int ret = 0;
2121#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
2122 ret = i2c_add_driver(&wm8903_i2c_driver); 2119 ret = i2c_add_driver(&wm8903_i2c_driver);
2123 if (ret != 0) { 2120 if (ret != 0) {
2124 printk(KERN_ERR "Failed to register wm8903 I2C driver: %d\n", 2121 printk(KERN_ERR "Failed to register wm8903 I2C driver: %d\n",
2125 ret); 2122 ret);
2126 } 2123 }
2127#endif
2128 return ret; 2124 return ret;
2129} 2125}
2130module_init(wm8903_modinit); 2126module_init(wm8903_modinit);
2131 2127
2132static void __exit wm8903_exit(void) 2128static void __exit wm8903_exit(void)
2133{ 2129{
2134#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
2135 i2c_del_driver(&wm8903_i2c_driver); 2130 i2c_del_driver(&wm8903_i2c_driver);
2136#endif
2137} 2131}
2138module_exit(wm8903_exit); 2132module_exit(wm8903_exit);
2139 2133