mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 21:02:19 +00:00
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>
This commit is contained in:
parent
d3398ff059
commit
542cc361de
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user