diff options
| author | Bartosz Golaszewski <brgl@bgdev.pl> | 2021-12-16 10:03:45 +0100 |
|---|---|---|
| committer | Bartosz Golaszewski <brgl@bgdev.pl> | 2021-12-17 12:26:14 +0100 |
| commit | ca7e7822d106a821331afd7388a754f572e7c096 (patch) | |
| tree | b6ad035ef587c3100ee61709664045f4f161a00d /include/linux | |
| parent | c73960bb0a4320b9ed0d5f202fa0a2bc7373c214 (diff) | |
| parent | 9d5f0f6644b1404f40266a2682add712dc9931f5 (diff) | |
Merge tag 'intel-gpio-v5.17-1' of gitolite.kernel.org:pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-next
intel-gpio for v5.17-1
- Don't set type for IRQ already in use in case of ACPI
- Drop unused call from GPIO ACPI library
- Clean up ML IOH and PCH GPIO drivers to make it closer to each other
- Clarify use of register file version in DesignWare driver
- other minor tweaks
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/gpio/consumer.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index 97a28ad3393b..3ad67b4a72be 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -690,7 +690,6 @@ void acpi_dev_remove_driver_gpios(struct acpi_device *adev); int devm_acpi_dev_add_driver_gpios(struct device *dev, const struct acpi_gpio_mapping *gpios); -void devm_acpi_dev_remove_driver_gpios(struct device *dev); struct gpio_desc *acpi_get_and_request_gpiod(char *path, int pin, char *label); @@ -708,7 +707,6 @@ static inline int devm_acpi_dev_add_driver_gpios(struct device *dev, { return -ENXIO; } -static inline void devm_acpi_dev_remove_driver_gpios(struct device *dev) {} #endif /* CONFIG_GPIOLIB && CONFIG_ACPI */ |