|
@@ -1288,7 +1288,7 @@ static struct spi_driver wm8900_spi_driver = {
|
|
|
};
|
|
|
#endif /* CONFIG_SPI_MASTER */
|
|
|
|
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
|
static int wm8900_i2c_probe(struct i2c_client *i2c,
|
|
|
const struct i2c_device_id *id)
|
|
|
{
|
|
@@ -1338,7 +1338,7 @@ static struct i2c_driver wm8900_i2c_driver = {
|
|
|
static int __init wm8900_modinit(void)
|
|
|
{
|
|
|
int ret = 0;
|
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
|
ret = i2c_add_driver(&wm8900_i2c_driver);
|
|
|
if (ret != 0) {
|
|
|
printk(KERN_ERR "Failed to register wm8900 I2C driver: %d\n",
|
|
@@ -1358,7 +1358,7 @@ module_init(wm8900_modinit);
|
|
|
|
|
|
static void __exit wm8900_exit(void)
|
|
|
{
|
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
|
i2c_del_driver(&wm8900_i2c_driver);
|
|
|
#endif
|
|
|
#if defined(CONFIG_SPI_MASTER)
|