Skip to content

Commit f196e9a

Browse files
morimotobroonie
authored andcommitted
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: Kuninori Morimoto <[email protected]> Acked-by: Charles Keepax <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 1001354 commit f196e9a

File tree

1 file changed

+1
-23
lines changed

1 file changed

+1
-23
lines changed

sound/soc/codecs/wm8523.c

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,6 @@ static const struct regmap_config wm8523_regmap = {
446446
.volatile_reg = wm8523_volatile_register,
447447
};
448448

449-
#if IS_ENABLED(CONFIG_I2C)
450449
static int wm8523_i2c_probe(struct i2c_client *i2c,
451450
const struct i2c_device_id *id)
452451
{
@@ -543,29 +542,8 @@ static struct i2c_driver wm8523_i2c_driver = {
543542
.remove = wm8523_i2c_remove,
544543
.id_table = wm8523_i2c_id,
545544
};
546-
#endif
547545

548-
static int __init wm8523_modinit(void)
549-
{
550-
int ret;
551-
#if IS_ENABLED(CONFIG_I2C)
552-
ret = i2c_add_driver(&wm8523_i2c_driver);
553-
if (ret != 0) {
554-
printk(KERN_ERR "Failed to register WM8523 I2C driver: %d\n",
555-
ret);
556-
}
557-
#endif
558-
return 0;
559-
}
560-
module_init(wm8523_modinit);
561-
562-
static void __exit wm8523_exit(void)
563-
{
564-
#if IS_ENABLED(CONFIG_I2C)
565-
i2c_del_driver(&wm8523_i2c_driver);
566-
#endif
567-
}
568-
module_exit(wm8523_exit);
546+
module_i2c_driver(wm8523_i2c_driver);
569547

570548
MODULE_DESCRIPTION("ASoC WM8523 driver");
571549
MODULE_AUTHOR("Mark Brown <[email protected]>");

0 commit comments

Comments
 (0)