|
@@ -912,7 +912,7 @@ static struct spi_driver wm8988_spi_driver = {
|
|
|
};
|
|
|
#endif /* CONFIG_SPI_MASTER */
|
|
|
|
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
|
static int wm8988_i2c_probe(struct i2c_client *i2c,
|
|
|
const struct i2c_device_id *id)
|
|
|
{
|
|
@@ -964,7 +964,7 @@ static struct i2c_driver wm8988_i2c_driver = {
|
|
|
static int __init wm8988_modinit(void)
|
|
|
{
|
|
|
int ret = 0;
|
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
|
ret = i2c_add_driver(&wm8988_i2c_driver);
|
|
|
if (ret != 0) {
|
|
|
printk(KERN_ERR "Failed to register WM8988 I2C driver: %d\n",
|
|
@@ -984,7 +984,7 @@ module_init(wm8988_modinit);
|
|
|
|
|
|
static void __exit wm8988_exit(void)
|
|
|
{
|
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
|
i2c_del_driver(&wm8988_i2c_driver);
|
|
|
#endif
|
|
|
#if defined(CONFIG_SPI_MASTER)
|