On Tue, 14 Mar 2017, Arnd Bergmann wrote: > On Tue, Mar 14, 2017 at 12:14 PM, Lee Jones <[email protected]> wrote: > > On Tue, 28 Feb 2017, Arnd Bergmann wrote: > > > >> When the db8500 watchdog is enabled without the PRCMU, we get a lot of > >> warnings about duplicate or missing helper functions: > >> > >> In file included from drivers/watchdog/ux500_wdt.c:21:0: > >> include/linux/mfd/dbx500-prcmu.h:422:19: error: redefinition of > >> 'prcmu_abb_read' > >> static inline int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size) > >> > >> This removes the duplicate function definitions and moves the helpers in > >> dbx500-prcmu outside of the #ifdef that hides them. > >> > >> Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible") > >> Signed-off-by: Arnd Bergmann <[email protected]> > >> --- > >> include/linux/mfd/db8500-prcmu.h | 27 ---------------------- > >> include/linux/mfd/dbx500-prcmu.h | 49 > >> ++++++++++++++++++++-------------------- > >> 2 files changed, 25 insertions(+), 51 deletions(-) > > > > Is this patch still valid? > > Yes. The build error was resolved with a different patch, but this is > still a useful cleanup.
Okay, so at least it needs LinusW's Ack. Once obtained can I take this independently from the rest of the set? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
