Commit b3907521 authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

gpiolib: Deduplicate forward declaration in the consumer.h header 



struct acpi_device is repeated in two branches of ifdeffery.
Move it out and hence deduplicate.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 40bb0e3e

include/linux/gpio/consumer.h

+2 −4
Original line number Diff line number Diff line
@@ -680,10 +680,10 @@ struct acpi_gpio_mapping { 
	unsigned int quirks;

};



#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_ACPI)



struct acpi_device;



#if IS_ENABLED(CONFIG_GPIOLIB) && IS_ENABLED(CONFIG_ACPI)



int acpi_dev_add_driver_gpios(struct acpi_device *adev,

			      const struct acpi_gpio_mapping *gpios);

void acpi_dev_remove_driver_gpios(struct acpi_device *adev);
@@ -696,8 +696,6 @@ struct gpio_desc *acpi_get_and_request_gpiod(char *path, int pin, char *label); 


#else  /* CONFIG_GPIOLIB && CONFIG_ACPI */



struct acpi_device;



static inline int acpi_dev_add_driver_gpios(struct acpi_device *adev,

			      const struct acpi_gpio_mapping *gpios)

{