Re: [pinctrl:devel 152/153] drivers/gpio/gpiolib.c:1942:19: error: conflicting types for 'gpiochip_add_irqchip'

[Thierry Reding <treding@nvidia.com>]

[-- Attachment #1: Type: text/plain, Size: 2312 bytes --]

On Wed, Nov 08, 2017 at 10:43:12PM +0800, kbuild test robot wrote:
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel
> head:   bfcadc85ef134881fce5f8635648e36de1ab4c9d
> commit: 959bc7b22bd25a3a907fbb9b26a1d0cbdf98ef40 [152/153] gpio: Automatically add lockdep keys
> config: x86_64-acpi-redef (attached as .config)
> compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
> reproduce:
>         git checkout 959bc7b22bd25a3a907fbb9b26a1d0cbdf98ef40
>         # save the attached .config to linux build tree
>         make ARCH=x86_64 
> 
> All error/warnings (new ones prefixed by >>):
> 
> >> drivers/gpio/gpiolib.c:1943:19: warning: 'struct lock_dep_class' declared inside parameter list will not be visible outside of this definition or declaration
>                struct lock_dep_class *lock_key)
>                       ^~~~~~~~~~~~~~
> >> drivers/gpio/gpiolib.c:1942:19: error: conflicting types for 'gpiochip_add_irqchip'
>     static inline int gpiochip_add_irqchip(struct gpio_chip *gpiochip,
>                       ^~~~~~~~~~~~~~~~~~~~
>    drivers/gpio/gpiolib.c:75:12: note: previous declaration of 'gpiochip_add_irqchip' was here
>     static int gpiochip_add_irqchip(struct gpio_chip *gpiochip,
>                ^~~~~~~~~~~~~~~~~~~~
> >> drivers/gpio/gpiolib.c:75:12: warning: 'gpiochip_add_irqchip' used but never defined
> 
> vim +/gpiochip_add_irqchip +1942 drivers/gpio/gpiolib.c
> 
>   1941	
> > 1942	static inline int gpiochip_add_irqchip(struct gpio_chip *gpiochip,
> > 1943					       struct lock_dep_class *lock_key)
>   1944	{
>   1945		return 0;
>   1946	}
>   1947	

Hi Linus,

this should be fixed with the following patch. It can just be squashed
into the lockdep keys patch.

Thierry
--- >8 ---
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 2b37f1e2ca76..6d9f225ed861 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1940,7 +1940,7 @@ EXPORT_SYMBOL_GPL(gpiochip_irqchip_add_key);
 #else /* CONFIG_GPIOLIB_IRQCHIP */

 static inline int gpiochip_add_irqchip(struct gpio_chip *gpiochip,
-                                      struct lock_dep_class *lock_key)
+                                      struct lock_class_key *lock_key)
 {
        return 0;
 }

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]