From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756140AbcAIVRN (ORCPT ); Sat, 9 Jan 2016 16:17:13 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:58710 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755886AbcAIVRK (ORCPT ); Sat, 9 Jan 2016 16:17:10 -0500 From: Arnd Bergmann To: linus.walleij@linaro.org Cc: Alexandre Courbot , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Alexander Shiyan Subject: [PATCH] gpio: generic: make bgpio_pdata always visible Date: Sat, 09 Jan 2016 22:16:42 +0100 Message-ID: <21095568.bdP2eOAsBs@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:Cg5Wq4H9fSFiwGlXYDfNJRIrgiAf2b+R0K5yfHYylG4/pbI6cyY nh5DF61tOJzUU7Jg/18jMR181GU46WSZqfmxOshhvepCWCj0DhSZx9mjqV7CiksBvf8OBHa pAieZVXJy1f/K9E2Kvbhr6ow4MT16EZ8s+iLSPvowaAA+8mhd15OoVCtLtuK4sdbs5zA8a1 T/45Oq1+Abw4iZ8IF6euw== X-UI-Out-Filterresults: notjunk:1;V01:K0:xbZrxjZoUR8=:ZulrKY9ysx9JuNhTENSpMJ DhtaP/2y3swZ84PKyuft8u1avdTFeof4t9k5nmjastfBNwhDH6041LnmHwC/Khe8YvUwAdbQe IGQJoHNZieJNWKo7LnnkDd0JVD2OkZbxNwhxlMRPVTpyBzMfLlR6KkwJaiQi5hZCKbNYxxuEM AR91QCgPbpf4nE/L0SHr4NcBzWqVTVECuxjgljwq5cEoSZGuypD3PfcmSkc3auKqjkkqUZ1Lj m+h6VEs8WdrKBqWKNddCDUHQQ3yqYZ3rbmSEsCPguXtu7aEyBdwg4ps7RkZ7zBynkFWHG66QH sK2KP06Fp3kMuVwNczLFHq8cUq32fqsXhWHGCwYvEzLB4uHhcFX3Z9b9Aq6PhMTbXbukG+ei0 b1Qj61Igwv2W4T/XOCvNuNSei9jTKwycsF9moThJB76cN59kv/62eJjGlTBfL5mF7jZJVwGr8 bICeOpB8S5ENpenQAwZOa5/exc0PILUKojFkeygOgTELDZ2r8bXotf/8tSrlbRmSfsz8t+Xua VmpqXqTUSMW+vPawuhv8WcfHes+JahYQIu9XeAg+HK2OpKwJe6ronqVMhbD1ujiNm6VQU8Rej ApbxsZ3zOZa1FLK0PDVw4cywjE1HiXqQ7sIYO1fc5sGpZ6D25U3YvMk3X8cNYzQmww+0V0e5n HoT6sZBLiv2AOGTxLZnx9duTnQZGxfYVN4yyDVNy7ZMjzJNsEIFiV7JR7oyFu7kJ99su1DAol vSilptltBJJugcfZ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Board files that define their own bgpio_pdata are broken when CONFIG_GPIO_GENERIC is disabled and the bgpio_pdata structure definition is hidden by the #ifdef: arch/arm/mach-clps711x/board-autcpu12.c:148:15: error: variable 'autcpu12_mmgpio_pdata' has initializer but incomplete type static struct bgpio_pdata autcpu12_mmgpio_pdata __initdata = { arch/arm/mach-clps711x/board-autcpu12.c:149:2: error: unknown field 'base' specified in initializer .base = AUTCPU12_MMGPIO_BASE, Since the board files should generally not care what drivers are enabled, this makes the structure definition visible again. Signed-off-by: Arnd Bergmann Fixes: 0f4630f3720e ("gpio: generic: factor into gpio_chip struct") diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index e2d05fd0e6e3..82fda487453f 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -220,14 +220,14 @@ static inline void *gpiochip_get_data(struct gpio_chip *chip) struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc); -#if IS_ENABLED(CONFIG_GPIO_GENERIC) - struct bgpio_pdata { const char *label; int base; int ngpio; }; +#if IS_ENABLED(CONFIG_GPIO_GENERIC) + int bgpio_init(struct gpio_chip *gc, struct device *dev, unsigned long sz, void __iomem *dat, void __iomem *set, void __iomem *clr, void __iomem *dirout, void __iomem *dirin,