提交 fae5e033 编写于 作者: A Arnd Bergmann 提交者: Lee Jones

mfd: rk808: Fix RK818_IRQ_DISCHG_ILIM initializer

When building with -Woverride-init, we get a warning about an incorrect
initializer:

drivers/mfd/rk808.c:244:8: error: initialized field overwritten [-Werror=override-init]
  [RK818_IRQ_DISCHG_ILIM] = {

This is clearly a mistake, as both RK818_IRQ_DISCHG_ILIM and RK818_IRQ_USB_OV
are defined as '7', but they refer to different register bits. Changing
RK818_IRQ_DISCHG_ILIM to 15 is consistent with how all other 14 interrupts are
handled here, so I'm assuming this is what it should have been.

Fixes: 2eedcbfc ("mfd: rk808: Add RK818 support")
Signed-off-by: NArnd Bergmann <arnd@arndb.de>
Acked-by: NAndy Yan <andy.yan@rock-chips.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
上级 b4feabe9
...@@ -244,7 +244,7 @@ enum rk818_reg { ...@@ -244,7 +244,7 @@ enum rk818_reg {
#define RK818_IRQ_CHG_TS1 12 #define RK818_IRQ_CHG_TS1 12
#define RK818_IRQ_TS2 13 #define RK818_IRQ_TS2 13
#define RK818_IRQ_CHG_CVTLIM 14 #define RK818_IRQ_CHG_CVTLIM 14
#define RK818_IRQ_DISCHG_ILIM 7 #define RK818_IRQ_DISCHG_ILIM 15
#define RK818_IRQ_VOUT_LO_MSK BIT(0) #define RK818_IRQ_VOUT_LO_MSK BIT(0)
#define RK818_IRQ_VB_LO_MSK BIT(1) #define RK818_IRQ_VB_LO_MSK BIT(1)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册