| Message ID | 20230125201020.10948-6-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: First attempt to clean up headers | expand |
On Wed, Jan 25, 2023, at 21:10, Andy Shevchenko wrote: > There is a few things done: > - include only the headers we are direct user of > - when pointer is in use, provide a forward declaration > - add missing headers > - group generic headers and subsystem headers > - sort each group alphabetically > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > include/asm-generic/gpio.h | 8 -------- > include/linux/gpio.h | 9 +++------ > include/linux/gpio/consumer.h | 14 ++++++++++---- > include/linux/gpio/driver.h | 34 ++++++++++++++++++++++++---------- > 4 files changed, 37 insertions(+), 28 deletions(-) This change looks fine, but it conflicts with a slightly broader cleanup that I meant to have already submitted, folding include/asm-generic/gpio.h into linux/gpio.h and removing the driver-side interface from that. Let me try to dig out my series again, we should be able to either use my version, or merge parts of this patch into it. Arnd
On Thu, Jan 26, 2023 at 09:42:32AM +0100, Arnd Bergmann wrote: > On Wed, Jan 25, 2023, at 21:10, Andy Shevchenko wrote: > > There is a few things done: > > - include only the headers we are direct user of > > - when pointer is in use, provide a forward declaration > > - add missing headers > > - group generic headers and subsystem headers > > - sort each group alphabetically > > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > --- > > include/asm-generic/gpio.h | 8 -------- > > include/linux/gpio.h | 9 +++------ > > include/linux/gpio/consumer.h | 14 ++++++++++---- > > include/linux/gpio/driver.h | 34 ++++++++++++++++++++++++---------- > > 4 files changed, 37 insertions(+), 28 deletions(-) > > This change looks fine, but it conflicts with a slightly > broader cleanup that I meant to have already submitted, > folding include/asm-generic/gpio.h into linux/gpio.h and > removing the driver-side interface from that. > > Let me try to dig out my series again, we should be able to > either use my version, or merge parts of this patch into it. Can you share your patches, so I will rebase mine on top and see what's left?
On Wed, Jan 25, 2023 at 9:10 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > There is a few things done: > - include only the headers we are direct user of > - when pointer is in use, provide a forward declaration > - add missing headers > - group generic headers and subsystem headers > - sort each group alphabetically > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Just to add to the confusion I was also pursuing a series of cleanups directed at just removing <linux/gpio/driver.h> from <linux/gpio.h>: https://lore.kernel.org/linux-gpio/CACRpkdb6yMqTkrJOg+K46RZ1478-gbxh6=tw4bzWmd--5nj_Bw@mail.gmail.com/ Right now I don't know what to do :D Linus
On Thu, Jan 26, 2023 at 11:22:00AM +0100, Linus Walleij wrote: > On Wed, Jan 25, 2023 at 9:10 PM Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: > > > There is a few things done: > > - include only the headers we are direct user of > > - when pointer is in use, provide a forward declaration > > - add missing headers > > - group generic headers and subsystem headers > > - sort each group alphabetically > > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > Just to add to the confusion I was also pursuing a series of cleanups directed > at just removing <linux/gpio/driver.h> from <linux/gpio.h>: > https://lore.kernel.org/linux-gpio/CACRpkdb6yMqTkrJOg+K46RZ1478-gbxh6=tw4bzWmd--5nj_Bw@mail.gmail.com/ > > Right now I don't know what to do :D I saw your series and find them very good! Can we have them applied? Arnd's one probably also needs to be considered sooner. This one can be postponed.
On Thu, Jan 26, 2023 at 1:16 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > > Just to add to the confusion I was also pursuing a series of cleanups directed > > at just removing <linux/gpio/driver.h> from <linux/gpio.h>: > > https://lore.kernel.org/linux-gpio/CACRpkdb6yMqTkrJOg+K46RZ1478-gbxh6=tw4bzWmd--5nj_Bw@mail.gmail.com/ > > > > Right now I don't know what to do :D > > I saw your series and find them very good! > Can we have them applied? I see that they will cause conflicts (patching files deleted in the big board removal) so I don't want to push them for the moment. I will send them out again though. Yours, Linus Walleij
On Thu, Jan 26, 2023, at 11:16, Andy Shevchenko wrote: > On Thu, Jan 26, 2023 at 09:42:32AM +0100, Arnd Bergmann wrote: >> On Wed, Jan 25, 2023, at 21:10, Andy Shevchenko wrote: >> > There is a few things done: >> > - include only the headers we are direct user of >> > - when pointer is in use, provide a forward declaration >> > - add missing headers >> > - group generic headers and subsystem headers >> > - sort each group alphabetically >> > >> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> >> > --- >> > include/asm-generic/gpio.h | 8 -------- >> > include/linux/gpio.h | 9 +++------ >> > include/linux/gpio/consumer.h | 14 ++++++++++---- >> > include/linux/gpio/driver.h | 34 ++++++++++++++++++++++++---------- >> > 4 files changed, 37 insertions(+), 28 deletions(-) >> >> This change looks fine, but it conflicts with a slightly >> broader cleanup that I meant to have already submitted, >> folding include/asm-generic/gpio.h into linux/gpio.h and >> removing the driver-side interface from that. >> >> Let me try to dig out my series again, we should be able to >> either use my version, or merge parts of this patch into it. > > Can you share your patches, so I will rebase mine on top and see what's left? > See the top patches of my randconfig branch at https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git/log/?h=randconfig-6.3-next There are eight cleanup patches for gpiolib, plus another seven patches for individual drivers. I just rebased the tree on top of linux-next, fixed previous build regression, and will send the gpiolib patches later on if there are no new problems with it. Arnd
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 22cb8c9efc1d..5d4d3529324c 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -3,11 +3,9 @@ #define _ASM_GENERIC_GPIO_H #include <linux/types.h> -#include <linux/errno.h> #ifdef CONFIG_GPIOLIB -#include <linux/compiler.h> #include <linux/gpio/driver.h> #include <linux/gpio/consumer.h> @@ -24,12 +22,7 @@ */ #define GPIO_DYNAMIC_BASE 512 -struct device; struct gpio; -struct seq_file; -struct module; -struct device_node; -struct gpio_desc; /* Always use the library code for GPIO management calls, * or when sleeping may be involved. @@ -60,7 +53,6 @@ static inline void gpio_set_value_cansleep(unsigned gpio, int value) return gpiod_set_raw_value_cansleep(gpio_to_desc(gpio), value); } - /* A platform's <asm/gpio.h> code may want to inline the I/O calls when * the GPIO is constant and refers to some always-present controller, * giving direct access to chip registers and tight bitbanging loops. diff --git a/include/linux/gpio.h b/include/linux/gpio.h index 85beb236c925..cc28c8d5e93c 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h @@ -12,7 +12,7 @@ #ifndef __LINUX_GPIO_H #define __LINUX_GPIO_H -#include <linux/errno.h> +struct device; /* see Documentation/driver-api/gpio/legacy.rst */ @@ -85,20 +85,17 @@ static inline int gpio_to_irq(unsigned int gpio) /* CONFIG_GPIOLIB: bindings for managed devices that want to request gpios */ -struct device; - int devm_gpio_request(struct device *dev, unsigned gpio, const char *label); int devm_gpio_request_one(struct device *dev, unsigned gpio, unsigned long flags, const char *label); #else /* ! CONFIG_GPIOLIB */ -#include <linux/bug.h> #include <linux/kernel.h> #include <linux/types.h> -struct device; -struct gpio_chip; +#include <asm/bug.h> +#include <asm/errno.h> static inline bool gpio_is_valid(int number) { diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index 5432e5d5fbfb..1c4385a00f88 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -3,15 +3,14 @@ #define __LINUX_GPIO_CONSUMER_H #include <linux/bits.h> -#include <linux/bug.h> -#include <linux/compiler_types.h> -#include <linux/err.h> +#include <linux/types.h> struct acpi_device; struct device; struct fwnode_handle; -struct gpio_desc; + struct gpio_array; +struct gpio_desc; /** * struct gpio_descs - Struct containing an array of descriptors that can be @@ -185,8 +184,11 @@ struct gpio_desc *devm_fwnode_gpiod_get_index(struct device *dev, #else /* CONFIG_GPIOLIB */ +#include <linux/err.h> #include <linux/kernel.h> +#include <asm/bug.h> + static inline int gpiod_count(struct device *dev, const char *con_id) { return 0; @@ -616,6 +618,8 @@ struct gpio_desc *acpi_get_and_request_gpiod(char *path, unsigned int pin, char #else /* CONFIG_GPIOLIB && CONFIG_ACPI */ +#include <linux/err.h> + static inline int acpi_dev_add_driver_gpios(struct acpi_device *adev, const struct acpi_gpio_mapping *gpios) { @@ -647,6 +651,8 @@ void gpiod_unexport(struct gpio_desc *desc); #else /* CONFIG_GPIOLIB && CONFIG_GPIO_SYSFS */ +#include <asm/errno.h> + static inline int gpiod_export(struct gpio_desc *desc, bool direction_may_change) { diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index caf2376dd98b..208c7cfeadb2 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -2,26 +2,29 @@ #ifndef __LINUX_GPIO_DRIVER_H #define __LINUX_GPIO_DRIVER_H -#include <linux/device.h> -#include <linux/irq.h> -#include <linux/irqchip/chained_irq.h> +#include <linux/bits.h> #include <linux/irqdomain.h> +#include <linux/irqhandler.h> #include <linux/lockdep.h> -#include <linux/pinctrl/pinconf-generic.h> #include <linux/pinctrl/pinctrl.h> #include <linux/property.h> +#include <linux/spinlock_types.h> #include <linux/types.h> +#ifdef CONFIG_GENERIC_MSI_IRQ #include <asm/msi.h> +#endif -struct gpio_desc; +struct device; +struct irq_chip; +struct irq_data; +struct module; struct of_phandle_args; +struct pinctrl_dev; struct seq_file; -struct gpio_device; -struct module; -enum gpiod_flags; -enum gpio_lookup_flags; +struct gpio_desc; +struct gpio_device; struct gpio_chip; union gpio_irq_fwspec { @@ -691,6 +694,10 @@ bool gpiochip_irqchip_irq_valid(const struct gpio_chip *gc, int gpiochip_irqchip_add_domain(struct gpio_chip *gc, struct irq_domain *domain); #else + +#include <asm/bug.h> +#include <asm/errno.h> + static inline int gpiochip_irqchip_add_domain(struct gpio_chip *gc, struct irq_domain *domain) { @@ -752,6 +759,9 @@ gpiochip_remove_pin_ranges(struct gpio_chip *gc) #ifdef CONFIG_GPIOLIB +enum gpiod_flags; +enum gpio_lookup_flags; + struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc, unsigned int hwnum, const char *label, @@ -768,8 +778,12 @@ struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc); #else /* CONFIG_GPIOLIB */ -#include <linux/gpio/machine.h> +#include <linux/err.h> + +#include <asm/bug.h> + #include <linux/gpio/consumer.h> +#include <linux/gpio/machine.h> static inline struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc, unsigned int hwnum,
There is a few things done: - include only the headers we are direct user of - when pointer is in use, provide a forward declaration - add missing headers - group generic headers and subsystem headers - sort each group alphabetically Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- include/asm-generic/gpio.h | 8 -------- include/linux/gpio.h | 9 +++------ include/linux/gpio/consumer.h | 14 ++++++++++---- include/linux/gpio/driver.h | 34 ++++++++++++++++++++++++---------- 4 files changed, 37 insertions(+), 28 deletions(-)