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

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

ASoC: wm8523: Remove #if IS_ENABLED(CONFIG_I2C) 



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

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

sound/soc/codecs/wm8523.c

+1 −23
Original line number Diff line number Diff line
@@ -446,7 +446,6 @@ static const struct regmap_config wm8523_regmap = { 
	.volatile_reg = wm8523_volatile_register,

};



#if IS_ENABLED(CONFIG_I2C)

static int wm8523_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

{
@@ -543,29 +542,8 @@ static struct i2c_driver wm8523_i2c_driver = { 
	.remove =   wm8523_i2c_remove,

	.id_table = wm8523_i2c_id,

};

#endif



static int __init wm8523_modinit(void)

{

	int ret;

#if IS_ENABLED(CONFIG_I2C)

	ret = i2c_add_driver(&wm8523_i2c_driver);

	if (ret != 0) {

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

		       ret);

	}

#endif

	return 0;

}

module_init(wm8523_modinit);



static void __exit wm8523_exit(void)

{

#if IS_ENABLED(CONFIG_I2C)

	i2c_del_driver(&wm8523_i2c_driver);

#endif

}

module_exit(wm8523_exit);

module_i2c_driver(wm8523_i2c_driver);



MODULE_DESCRIPTION("ASoC WM8523 driver");

MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");