mfd: max77693: Adjust FLASH_EN_SHIFT and TORCH_EN_SHIFT macros

Modify FLASH_EN_SHIFT and TORCH_EN_SHIFT macros to work properly
when passed enum max77693_fled values (0 for FLED1 and 1 for FLED2)
from leds-max77693 driver. Previous definitions were compatible with
one of the previous RFC versions of leds-max77693.c driver, which was
not merged.

Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index 955dd990beafaf3e82fab52902e9d35b2e03d4f9..5acd7104ad34d887893a67b578402191a129a241 100644 (file)
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -113,8 +113,8 @@ enum max77693_pmic_reg {
 #define FLASH_EN_FLASH         0x1
 #define FLASH_EN_TORCH         0x2
 #define FLASH_EN_ON            0x3
-#define FLASH_EN_SHIFT(x)      (6 - ((x) - 1) * 2)
-#define TORCH_EN_SHIFT(x)      (2 - ((x) - 1) * 2)
+#define FLASH_EN_SHIFT(x)      (6 - (x) * 2)
+#define TORCH_EN_SHIFT(x)      (2 - (x) * 2)
 
 /* MAX77693 MAX_FLASH1 register */
 #define MAX_FLASH1_MAX_FL_EN   0x80