|
|
@@ -469,7 +469,7 @@ static struct spi_driver wm8711_spi_driver = {
|
|
|
};
|
|
|
#endif /* CONFIG_SPI_MASTER */
|
|
|
|
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
|
static int wm8711_i2c_probe(struct i2c_client *client,
|
|
|
const struct i2c_device_id *id)
|
|
|
{
|
|
|
@@ -520,7 +520,7 @@ static struct i2c_driver wm8711_i2c_driver = {
|
|
|
static int __init wm8711_modinit(void)
|
|
|
{
|
|
|
int ret;
|
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
|
ret = i2c_add_driver(&wm8711_i2c_driver);
|
|
|
if (ret != 0) {
|
|
|
printk(KERN_ERR "Failed to register WM8711 I2C driver: %d\n",
|
|
|
@@ -540,7 +540,7 @@ module_init(wm8711_modinit);
|
|
|
|
|
|
static void __exit wm8711_exit(void)
|
|
|
{
|
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
|
i2c_del_driver(&wm8711_i2c_driver);
|
|
|
#endif
|
|
|
#if defined(CONFIG_SPI_MASTER)
|