diff options
| author | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2022-11-16 10:20:33 +0100 |
|---|---|---|
| committer | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2022-11-16 10:20:33 +0100 |
| commit | 8fd3f7be339899b1dff8b5646822ac48fba3d587 (patch) | |
| tree | ce2c6e839f467e20911c65bb7e38b74710490e6b /drivers/gpio | |
| parent | 24c94060fc9b4e0f19e6e018869db46db21d6bc7 (diff) | |
| parent | 8d259847243d1e21a866e828c4ce90d759f3d17b (diff) | |
Merge tag 'intel-gpio-v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-next
intel-gpio for v6.2-1
* Miscellaneous updates to the core (cdev, acpi) and Intel Merrifield driver
The following is an automated git shortlog grouped by driver:
gpiolib:
- cdev: Fix typo in kernel doc for struct line
- acpi: Use METHOD_NAME__AEI macro for acpi_walk_resources
merrifield:
- Use str_enable_disable() helper
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-merrifield.c | 3 | ||||
| -rw-r--r-- | drivers/gpio/gpiolib-acpi.c | 2 | ||||
| -rw-r--r-- | drivers/gpio/gpiolib-cdev.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c index 72ac09a59702..92ea8411050d 100644 --- a/drivers/gpio/gpio-merrifield.c +++ b/drivers/gpio/gpio-merrifield.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/pci.h> #include <linux/pinctrl/consumer.h> +#include <linux/string_helpers.h> #define GCCR 0x000 /* controller configuration */ #define GPLR 0x004 /* pin level r/o */ @@ -331,7 +332,7 @@ static int mrfld_irq_set_wake(struct irq_data *d, unsigned int on) raw_spin_unlock_irqrestore(&priv->lock, flags); - dev_dbg(priv->dev, "%sable wake for gpio %u\n", on ? "en" : "dis", gpio); + dev_dbg(priv->dev, "%s wake for gpio %u\n", str_enable_disable(on), gpio); return 0; } diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index c99c94e5483f..bed0380c5136 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -536,7 +536,7 @@ void acpi_gpiochip_request_interrupts(struct gpio_chip *chip) if (ACPI_FAILURE(status)) return; - acpi_walk_resources(handle, "_AEI", + acpi_walk_resources(handle, METHOD_NAME__AEI, acpi_gpiochip_alloc_event, acpi_gpio); mutex_lock(&acpi_gpio_deferred_req_irqs_lock); diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c index 0cb6b468f364..08606f32372c 100644 --- a/drivers/gpio/gpiolib-cdev.c +++ b/drivers/gpio/gpiolib-cdev.c @@ -410,7 +410,7 @@ out_free_lh: * @desc: the GPIO descriptor for this line. * @req: the corresponding line request * @irq: the interrupt triggered in response to events on this GPIO - * @eflags: the edge flags, GPIO_V2_LINE_FLAG_EDGE_RISING and/or + * @edflags: the edge flags, GPIO_V2_LINE_FLAG_EDGE_RISING and/or * GPIO_V2_LINE_FLAG_EDGE_FALLING, indicating the edge detection applied * @timestamp_ns: cache for the timestamp storing it between hardirq and * IRQ thread, used to bring the timestamp close to the actual event |