ASoC: Remove I2C ifdefs from wm8961 driver
The driver only supports I2C so no need to conditionalise its use. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
b9791c0109
commit
69be6660f3
1 changed files with 0 additions and 6 deletions
|
@ -1081,7 +1081,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8961 = {
|
||||||
.volatile_register = wm8961_volatile_register,
|
.volatile_register = wm8961_volatile_register,
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
||||||
static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
|
static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
|
||||||
const struct i2c_device_id *id)
|
const struct i2c_device_id *id)
|
||||||
{
|
{
|
||||||
|
@ -1123,27 +1122,22 @@ static struct i2c_driver wm8961_i2c_driver = {
|
||||||
.remove = __devexit_p(wm8961_i2c_remove),
|
.remove = __devexit_p(wm8961_i2c_remove),
|
||||||
.id_table = wm8961_i2c_id,
|
.id_table = wm8961_i2c_id,
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
static int __init wm8961_modinit(void)
|
static int __init wm8961_modinit(void)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
||||||
ret = i2c_add_driver(&wm8961_i2c_driver);
|
ret = i2c_add_driver(&wm8961_i2c_driver);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
printk(KERN_ERR "Failed to register wm8961 I2C driver: %d\n",
|
printk(KERN_ERR "Failed to register wm8961 I2C driver: %d\n",
|
||||||
ret);
|
ret);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
module_init(wm8961_modinit);
|
module_init(wm8961_modinit);
|
||||||
|
|
||||||
static void __exit wm8961_exit(void)
|
static void __exit wm8961_exit(void)
|
||||||
{
|
{
|
||||||
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
||||||
i2c_del_driver(&wm8961_i2c_driver);
|
i2c_del_driver(&wm8961_i2c_driver);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
module_exit(wm8961_exit);
|
module_exit(wm8961_exit);
|
||||||
|
|
||||||
|
|
Reference in a new issue