Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

gpiolib: use the required minimum set of headers

Andy suggested we should keep a fine-grained scheme for includes and
only pull in stuff required within individual ifdef sections. Let's
revert commit dea69f2d1cc8 ("gpiolib: move all includes to the top of
gpio/consumer.h") and make the headers situation even more fine-grained
by only including the first level headers containing requireded symbols
except for bug.h where checkpatch.pl warns against including asm/bug.h.

Fixes: dea69f2d1cc8 ("gpiolib: move all includes to the top of gpio/consumer.h")
Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Closes: https://lore.kernel.org/all/Z7XPcYtaA4COHDYj@smile.fi.intel.com/
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Link: https://lore.kernel.org/r/20250225095210.25910-1-brgl@bgdev.pl
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

+6 -3
+6 -3
include/linux/gpio/consumer.h
··· 3 3 #define __LINUX_GPIO_CONSUMER_H 4 4 5 5 #include <linux/bits.h> 6 - #include <linux/bug.h> 7 6 #include <linux/err.h> 8 - #include <linux/errno.h> 9 - #include <linux/kernel.h> 10 7 #include <linux/types.h> 11 8 12 9 struct acpi_device; ··· 181 184 const char *label); 182 185 183 186 #else /* CONFIG_GPIOLIB */ 187 + 188 + #include <linux/bug.h> 189 + #include <linux/kernel.h> 184 190 185 191 static inline int gpiod_count(struct device *dev, const char *con_id) 186 192 { ··· 549 549 int gpiod_enable_hw_timestamp_ns(struct gpio_desc *desc, unsigned long flags); 550 550 int gpiod_disable_hw_timestamp_ns(struct gpio_desc *desc, unsigned long flags); 551 551 #else 552 + 553 + #include <linux/bug.h> 554 + 552 555 static inline int gpiod_enable_hw_timestamp_ns(struct gpio_desc *desc, 553 556 unsigned long flags) 554 557 {