Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d59b4eaa authored by Shawn Guo's avatar Shawn Guo Committed by Linus Walleij
Browse files

gpio: fix warning of 'struct gpio_chip' declaration 



The struct gpio_chip is only defined inside #ifdef CONFIG_GPIOLIB,
but it's referenced by gpiochip_add_pin_range() and
gpiochip_remove_pin_ranges() which are outside #ifdef CONFIG_GPIOLIB.
Thus, we see the following warning when building blackfin image, where
GPIOLIB is not required.

  CC      arch/blackfin/kernel/bfin_gpio.o
  CC      init/version.o
In file included from arch/blackfin/include/asm/gpio.h:321,
                 from arch/blackfin/kernel/bfin_gpio.c:15:
include/asm-generic/gpio.h:298: warning: 'struct gpio_chip' declared inside parameter list
include/asm-generic/gpio.h:298: warning: its scope is only this definition or declaration, which is probably not what you want
include/asm-generic/gpio.h:304: warning: 'struct gpio_chip' declared inside parameter list

Move pinctrl trunk into #ifdef CONFIG_GPIOLIB to fix the warning,
since it appears that pinctrl gpio range support depends on GPIOLIB.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c111feab

include/asm-generic/gpio.h

+37 −37
Original line number Diff line number Diff line
@@ -212,6 +212,43 @@ extern void gpio_unexport(unsigned gpio); 


#endif	/* CONFIG_GPIO_SYSFS */



#ifdef CONFIG_PINCTRL



/**

 * struct gpio_pin_range - pin range controlled by a gpio chip

 * @head: list for maintaining set of pin ranges, used internally

 * @pctldev: pinctrl device which handles corresponding pins

 * @range: actual range of pins controlled by a gpio controller

 */



struct gpio_pin_range {

	struct list_head node;

	struct pinctrl_dev *pctldev;

	struct pinctrl_gpio_range range;

};



int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,

			   unsigned int gpio_offset, unsigned int pin_offset,

			   unsigned int npins);

void gpiochip_remove_pin_ranges(struct gpio_chip *chip);



#else



static inline int

gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,

		       unsigned int gpio_offset, unsigned int pin_offset,

		       unsigned int npins)

{

	return 0;

}



static inline void

gpiochip_remove_pin_ranges(struct gpio_chip *chip)

{

}



#endif /* CONFIG_PINCTRL */



#else	/* !CONFIG_GPIOLIB */



static inline bool gpio_is_valid(int number)
@@ -270,41 +307,4 @@ static inline void gpio_unexport(unsigned gpio) 
}

#endif	/* CONFIG_GPIO_SYSFS */



#ifdef CONFIG_PINCTRL



/**

 * struct gpio_pin_range - pin range controlled by a gpio chip

 * @head: list for maintaining set of pin ranges, used internally

 * @pctldev: pinctrl device which handles corresponding pins

 * @range: actual range of pins controlled by a gpio controller

 */



struct gpio_pin_range {

	struct list_head node;

	struct pinctrl_dev *pctldev;

	struct pinctrl_gpio_range range;

};



int gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,

			   unsigned int gpio_offset, unsigned int pin_offset,

			   unsigned int npins);

void gpiochip_remove_pin_ranges(struct gpio_chip *chip);



#else



static inline int

gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,

		       unsigned int gpio_offset, unsigned int pin_offset,

		       unsigned int npins)

{

	return 0;

}



static inline void

gpiochip_remove_pin_ranges(struct gpio_chip *chip)

{

}



#endif /* CONFIG_PINCTRL */



#endif /* _ASM_GENERIC_GPIO_H */