From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752122AbdB1VJr (ORCPT ); Tue, 28 Feb 2017 16:09:47 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:51302 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751981AbdB1VJm (ORCPT ); Tue, 28 Feb 2017 16:09:42 -0500 From: Arnd Bergmann To: Guenter Roeck Cc: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, Lee Jones , linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 1/8] mfd: retu: add inline alternatives for CONFIG_RETU=n Date: Tue, 28 Feb 2017 22:01:16 +0100 Message-Id: <20170228210123.3404816-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170228210123.3404816-1-arnd@arndb.de> References: <20170228210123.3404816-1-arnd@arndb.de> X-Provags-ID: V03:K0:T3H/jrM6pWhG2ovbt50bxlUEnvwApUb0HTp4xkHriq2FhNjNOPL 4zv4UVkDI72y8FrEXR4atQG0S70qnqjFxpS89niznd8Nq90YyR3OLFLz2VH8BHVRUNVKGs7 sn+dTLARgfO53SJLcDfo6s8HwMKqd8tlllosICWBdVn89xwFnGgAfXbQShcBPFRXZND2j0c sJ+OC0u/zLL03BG7SL4gw== X-UI-Out-Filterresults: notjunk:1;V01:K0:peQcxk0GeTk=:T9qcBXL9w5kNyuc2zDastu PBLC82cRH3hUDiwYTjE7YqIXiCihZjchTDpTuZ8EGHpiDM/Km63B+Hnr+0yoTzJTfZyXaIEVk BALg4/gM72JulIGO9yDRWa+O8K7TSvvdAi087o5v4NDDcNySIVaLpNWmdhPkSv41hJm94Jqq1 mNGhjl4tL9YYheNBUQW7yJcc4KlIObzG3gagnmJt2jMGAZWhpcxclEwQqlVGztYgot2T7DK7y 22njGgAcCIjCBPU28yYvfG2yCl3f/GtI504KZZZ9nfGLxS6TUhO8wBhlvQsKXmEtkFKsH8ZoO uWqjip+6KyqpvtE9+HTyxuaoeoo1ZTea1ajr8/SlxvfZRqXi0T7AvI9GOVue9DBhhaBcs1JH8 HhMZraREhFFOndNdENKj9aFOKa1LRo0tObe83COeHdDtTv6Hj9v4xMkgsa+JcUjsmuuQmDYf9 2sQD2AxYBS+H+jY2XEuBPgjAt0qF0QGNxBdksRhWZP/e8z/nSWbByLhReKShW2fIERgRderjT IsdEdR+b4SDSEF/ihsvInROGCTsi2KV5Cg1oMHiQ8CPMzXaOGZp2HcNbH7SLUZ9LQVaFqxF// 3knq5AlFskmHGpP/0IJebZ84tO8RHzNgovSvcPUkMgF2prrKzkJBXAU8y0Kmiva4OjMYslNMh dEUu1CG4ZtwM/upxOTmvdVoGat09Vns4LV8898EiqPitE9k3yEQHBeZQx65pLRJOL84Y= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The retu watchdog calls into the respective mfd driver, but fails to link if that is diabled: drivers/watchdog/built-in.o: In function `retu_wdt_set_timeout': ziirave_wdt.c:(.text+0x8c88): undefined reference to `retu_write' ziirave_wdt.c:(.text+0x8c88): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `retu_write' drivers/watchdog/built-in.o: In function `retu_wdt_start': ziirave_wdt.c:(.text+0x8cc8): undefined reference to `retu_write' ziirave_wdt.c:(.text+0x8cc8): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `retu_write' This adds inline stub helpers that let us build the driver anyway. Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible") Signed-off-by: Arnd Bergmann --- drivers/watchdog/Kconfig | 2 +- include/linux/mfd/retu.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index c831b7967bf9..6ca2f3ae7f1e 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -585,7 +585,7 @@ config UX500_WATCHDOG config RETU_WATCHDOG tristate "Retu watchdog" - depends on MFD_RETU || COMPILE_TEST + depends on MFD_RETU || (COMPILE_TEST && MFD_RETU=n) select WATCHDOG_CORE help Retu watchdog driver for Nokia Internet Tablets (770, N800, diff --git a/include/linux/mfd/retu.h b/include/linux/mfd/retu.h index 65471c4a3926..a6828e899775 100644 --- a/include/linux/mfd/retu.h +++ b/include/linux/mfd/retu.h @@ -11,8 +11,13 @@ struct retu_dev; +#if IS_ENABLED(CONFIG_MFD_RETU) int retu_read(struct retu_dev *, u8); int retu_write(struct retu_dev *, u8, u16); +#else +static inline int retu_read(struct retu_dev *dev, u8 r) { return -EINVAL; } +static inline int retu_write(struct retu_dev *dev, u8 r, u16 v) { return -EINVAL; } +#endif /* Registers */ #define RETU_REG_WATCHDOG 0x17 /* Watchdog */ -- 2.9.0