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

Commit 4a5cf132 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: uda1380: Remove #if IS_ENABLED(CONFIG_I2C) 



uda1380 driver doesn't work without CONFIG_I2C anyway.
Let's remove #if IS_ENABLED(CONFIG_I2C), and use module_i2c_driver().

And, this patch adds "depends on I2C" to Kconfig

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1001354c

sound/soc/codecs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -874,6 +874,7 @@ config SND_SOC_UDA134X 


config SND_SOC_UDA1380

        tristate

	depends on I2C



config SND_SOC_WL1273

	tristate

sound/soc/codecs/uda1380.c

+1 −21
Original line number Diff line number Diff line
@@ -775,7 +775,6 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = { 
	},

};



#if IS_ENABLED(CONFIG_I2C)

static int uda1380_i2c_probe(struct i2c_client *i2c,

			     const struct i2c_device_id *id)

{
@@ -815,27 +814,8 @@ static struct i2c_driver uda1380_i2c_driver = { 
	.remove =   uda1380_i2c_remove,

	.id_table = uda1380_i2c_id,

};

#endif



static int __init uda1380_modinit(void)

{

	int ret = 0;

#if IS_ENABLED(CONFIG_I2C)

	ret = i2c_add_driver(&uda1380_i2c_driver);

	if (ret != 0)

		pr_err("Failed to register UDA1380 I2C driver: %d\n", ret);

#endif

	return ret;

}

module_init(uda1380_modinit);



static void __exit uda1380_exit(void)

{

#if IS_ENABLED(CONFIG_I2C)

	i2c_del_driver(&uda1380_i2c_driver);

#endif

}

module_exit(uda1380_exit);

module_i2c_driver(uda1380_i2c_driver);



MODULE_AUTHOR("Giorgio Padrin");

MODULE_DESCRIPTION("Audio support for codec Philips UDA1380");