diff options
| author | Bartosz Golaszewski <brgl@bgdev.pl> | 2022-04-16 21:57:00 +0200 |
|---|---|---|
| committer | Bartosz Golaszewski <brgl@bgdev.pl> | 2022-04-16 21:57:00 +0200 |
| commit | 0ebb4fbe31343a42370a2897ea9424fe78f3a88f (patch) | |
| tree | 63c88d4fb92a4042407eb4c8e070b404831d93a6 /include | |
| parent | 3836c73e6a2585561af928c6641d74528a8bdfa4 (diff) | |
| parent | 0c2cae09a765b1c1d842eb9328982976ec735926 (diff) | |
Merge tag 'intel-gpio-v5.18-2' of gitolite.kernel.org:pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current
intel-gpio for v5.18-2
* Couple of fixes related to handling unsigned value of the pin from ACPI
gpiolib:
- acpi: Convert type for pin to be unsigned
- acpi: use correct format characters
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/gpio/consumer.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index c3aa8b330e1c..e71f6e1bfafe 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -688,7 +688,7 @@ 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); -struct gpio_desc *acpi_get_and_request_gpiod(char *path, int pin, char *label); +struct gpio_desc *acpi_get_and_request_gpiod(char *path, unsigned int pin, char *label); #else /* CONFIG_GPIOLIB && CONFIG_ACPI */ @@ -705,6 +705,12 @@ static inline int devm_acpi_dev_add_driver_gpios(struct device *dev, return -ENXIO; } +static inline struct gpio_desc *acpi_get_and_request_gpiod(char *path, unsigned int pin, + char *label) +{ + return ERR_PTR(-ENOSYS); +} + #endif /* CONFIG_GPIOLIB && CONFIG_ACPI */ |