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

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / leds / leds-bd2802.c

diff --git a/drivers/leds/leds-bd2802.c b/drivers/leds/leds-bd2802.c
index 9abe8de..8515170 100644 (file)
--- a/drivers/leds/leds-bd2802.c
+++ b/drivers/leds/leds-bd2802.c
@@ -26,8 +26,8 @@
 #define BD2802_LED_OFFSET              0xa
 #define BD2802_COLOR_OFFSET            0x3
 
-#define BD2802_REG_CLKSETUP            0x00
-#define BD2802_REG_CONTROL             0x01
+#define BD2802_REG_CLKSETUP            0x00
+#define BD2802_REG_CONTROL             0x01
 #define BD2802_REG_HOURSETUP           0x02
 #define BD2802_REG_CURRENT1SETUP       0x03
 #define BD2802_REG_CURRENT2SETUP       0x04
@@ -93,7 +93,7 @@ struct bd2802_led {
         * In ADF mode, user can set registers of BD2802GU directly,
         * therefore BD2802GU doesn't enter reset state.
         */
-       int                             adf_on;
+       int                             adf_on;
 
        enum led_ids                    led_id;
        enum led_colors                 color;
@@ -328,7 +328,7 @@ static ssize_t bd2802_store_reg##reg_addr(struct device *dev,               \
        int ret;                                                        \
        if (!count)                                                     \
                return -EINVAL;                                         \
-       ret = strict_strtoul(buf, 16, &val);                            \
+       ret = kstrtoul(buf, 16, &val);                                  \
        if (ret)                                                        \
                return ret;                                             \
        down_write(&led->rwsem);                                        \
@@ -492,7 +492,7 @@ static ssize_t bd2802_store_##attr_name(struct device *dev,         \
        int ret;                                                        \
        if (!count)                                                     \
                return -EINVAL;                                         \
-       ret = strict_strtoul(buf, 16, &val);                            \
+       ret = kstrtoul(buf, 16, &val);                                  \
        if (ret)                                                        \
                return ret;                                             \
        down_write(&led->rwsem);                                        \