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

Commit 12a7a709 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Remove conditional I2C usage from tlv320aic3x driver 



The driver only supports I2C so doesn't need to do things conditionally.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarJarkko Nikula <jhnikula@gmail.com>
parent f733547a

sound/soc/codecs/tlv320aic3x.c

+0 −6
Original line number Diff line number Diff line
@@ -1481,7 +1481,6 @@ static struct snd_soc_codec_driver soc_codec_dev_aic3x = { 
	.resume = aic3x_resume,

};



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

/*

 * AIC3X 2 wire address can be up to 4 devices with device addresses

 * 0x18, 0x19, 0x1A, 0x1B
@@ -1548,27 +1547,22 @@ static struct i2c_driver aic3x_i2c_driver = { 
	.remove = aic3x_i2c_remove,

	.id_table = aic3x_i2c_id,

};

#endif



static int __init aic3x_modinit(void)

{

	int ret = 0;

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

	ret = i2c_add_driver(&aic3x_i2c_driver);

	if (ret != 0) {

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

		       ret);

	}

#endif

	return ret;

}

module_init(aic3x_modinit);



static void __exit aic3x_exit(void)

{

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

	i2c_del_driver(&aic3x_i2c_driver);

#endif

}

module_exit(aic3x_exit);