From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761750AbcINLVO (ORCPT ); Wed, 14 Sep 2016 07:21:14 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:34226 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758398AbcINLVN (ORCPT ); Wed, 14 Sep 2016 07:21:13 -0400 Date: Wed, 14 Sep 2016 12:23:10 +0100 From: Lee Jones To: Arnd Bergmann Cc: Andy Yan , Wadim Egorov , linux-kernel@vger.kernel.org Subject: Re: [PATCH] rk808: fix RK818_IRQ_DISCHG_ILIM initializer Message-ID: <20160914112310.GE638@dell> References: <20160906131351.1845848-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160906131351.1845848-1-arnd@arndb.de> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 06 Sep 2016, Arnd Bergmann wrote: > 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. > > Signed-off-by: Arnd Bergmann > Fixes: 2eedcbfc0612 ("mfd: rk808: Add RK818 support") > --- > include/linux/mfd/rk808.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied, thanks. > diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h > index fc5db6fcb57d..6d435a3c06bc 100644 > --- a/include/linux/mfd/rk808.h > +++ b/include/linux/mfd/rk808.h > @@ -244,7 +244,7 @@ enum rk818_reg { > #define RK818_IRQ_CHG_TS1 12 > #define RK818_IRQ_TS2 13 > #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_VB_LO_MSK BIT(1) -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog