Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[deliverable/linux.git] / drivers / mfd / dm355evm_msp.c

diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
index ec4438ed2fafd73415b3efb40b131e587ddbf45a..14661ec5ef7fe46beb514ff8b3a6e5822e989019 100644 (file)
--- a/drivers/mfd/dm355evm_msp.c
+++ b/drivers/mfd/dm355evm_msp.c
@@ -33,25 +33,25 @@
  * This driver was tested with firmware revision A4.
  */
 
-#if defined(CONFIG_INPUT_DM355EVM) || defined(CONFIG_INPUT_DM355EVM_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_DM355EVM)
 #define msp_has_keyboard()     true
 #else
 #define msp_has_keyboard()     false
 #endif
 
-#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
+#if IS_ENABLED(CONFIG_LEDS_GPIO)
 #define msp_has_leds()         true
 #else
 #define msp_has_leds()         false
 #endif
 
-#if defined(CONFIG_RTC_DRV_DM355EVM) || defined(CONFIG_RTC_DRV_DM355EVM_MODULE)
+#if IS_ENABLED(CONFIG_RTC_DRV_DM355EVM)
 #define msp_has_rtc()          true
 #else
 #define msp_has_rtc()          false
 #endif
 
-#if defined(CONFIG_VIDEO_TVP514X) || defined(CONFIG_VIDEO_TVP514X_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_TVP514X)
 #define msp_has_tvp()          true
 #else
 #define msp_has_tvp()          false
@@ -260,7 +260,7 @@ static int add_children(struct i2c_client *client)
 
        /* GPIO-ish stuff */
        dm355evm_msp_gpio.parent = &client->dev;
-       status = gpiochip_add(&dm355evm_msp_gpio);
+       status = gpiochip_add_data(&dm355evm_msp_gpio, NULL);
        if (status < 0)
                return status;