Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 542cc361 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Make WM8971 I2C usage unconditional 



The driver only supports I2C so no need to worry about SPI only systems.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d3398ff0

sound/soc/codecs/wm8971.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -688,7 +688,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8971 = { 
	.reg_cache_default = wm8971_reg,

	.reg_cache_default = wm8971_reg,

};

};





#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)

static __devinit int wm8971_i2c_probe(struct i2c_client *i2c,

static __devinit int wm8971_i2c_probe(struct i2c_client *i2c,

				      const struct i2c_device_id *id)

				      const struct i2c_device_id *id)

{

{
@@ -731,27 +730,22 @@ static struct i2c_driver wm8971_i2c_driver = { 
	.remove =   __devexit_p(wm8971_i2c_remove),

	.remove =   __devexit_p(wm8971_i2c_remove),

	.id_table = wm8971_i2c_id,

	.id_table = wm8971_i2c_id,

};

};

#endif





static int __init wm8971_modinit(void)

static int __init wm8971_modinit(void)

{

{

	int ret = 0;

	int ret = 0;

#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)

	ret = i2c_add_driver(&wm8971_i2c_driver);

	ret = i2c_add_driver(&wm8971_i2c_driver);

	if (ret != 0) {

	if (ret != 0) {

		printk(KERN_ERR "Failed to register WM8971 I2C driver: %d\n",

		printk(KERN_ERR "Failed to register WM8971 I2C driver: %d\n",

		       ret);

		       ret);

	}

	}

#endif

	return ret;

	return ret;

}

}

module_init(wm8971_modinit);

module_init(wm8971_modinit);





static void __exit wm8971_exit(void)

static void __exit wm8971_exit(void)

{

{

#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)

	i2c_del_driver(&wm8971_i2c_driver);

	i2c_del_driver(&wm8971_i2c_driver);

#endif

}

}

module_exit(wm8971_exit);

module_exit(wm8971_exit);