|
@@ -816,7 +816,7 @@ static struct spi_driver wm8750_spi_driver = {
|
|
};
|
|
};
|
|
#endif /* CONFIG_SPI_MASTER */
|
|
#endif /* CONFIG_SPI_MASTER */
|
|
|
|
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
static int wm8750_i2c_probe(struct i2c_client *i2c,
|
|
static int wm8750_i2c_probe(struct i2c_client *i2c,
|
|
const struct i2c_device_id *id)
|
|
const struct i2c_device_id *id)
|
|
{
|
|
{
|
|
@@ -868,7 +868,7 @@ static struct i2c_driver wm8750_i2c_driver = {
|
|
static int __init wm8750_modinit(void)
|
|
static int __init wm8750_modinit(void)
|
|
{
|
|
{
|
|
int ret = 0;
|
|
int ret = 0;
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
ret = i2c_add_driver(&wm8750_i2c_driver);
|
|
ret = i2c_add_driver(&wm8750_i2c_driver);
|
|
if (ret != 0) {
|
|
if (ret != 0) {
|
|
printk(KERN_ERR "Failed to register wm8750 I2C driver: %d\n",
|
|
printk(KERN_ERR "Failed to register wm8750 I2C driver: %d\n",
|
|
@@ -888,7 +888,7 @@ module_init(wm8750_modinit);
|
|
|
|
|
|
static void __exit wm8750_exit(void)
|
|
static void __exit wm8750_exit(void)
|
|
{
|
|
{
|
|
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
|
|
|
|
|
+#if IS_ENABLED(CONFIG_I2C)
|
|
i2c_del_driver(&wm8750_i2c_driver);
|
|
i2c_del_driver(&wm8750_i2c_driver);
|
|
#endif
|
|
#endif
|
|
#if defined(CONFIG_SPI_MASTER)
|
|
#if defined(CONFIG_SPI_MASTER)
|