Commit 429440c9 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Make WM8904 I2C usage unconditional 



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

sound/soc/codecs/wm8904.c

+0 −6
Original line number Diff line number Diff line
@@ -2525,7 +2525,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8904 = { 
	.volatile_register = wm8904_volatile_register,

};



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

static __devinit int wm8904_i2c_probe(struct i2c_client *i2c,

				      const struct i2c_device_id *id)

{
@@ -2571,27 +2570,22 @@ static struct i2c_driver wm8904_i2c_driver = { 
	.remove =   __devexit_p(wm8904_i2c_remove),

	.id_table = wm8904_i2c_id,

};

#endif



static int __init wm8904_modinit(void)

{

	int ret = 0;

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

	ret = i2c_add_driver(&wm8904_i2c_driver);

	if (ret != 0) {

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

		       ret);

	}

#endif

	return ret;

}

module_init(wm8904_modinit);



static void __exit wm8904_exit(void)

{

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

	i2c_del_driver(&wm8904_i2c_driver);

#endif

}

module_exit(wm8904_exit);