diff options
| author | Benjamin Tissoires <bentiss@kernel.org> | 2024-09-13 17:04:30 +0300 |
|---|---|---|
| committer | Benjamin Tissoires <bentiss@kernel.org> | 2024-09-13 17:04:30 +0300 |
| commit | 0aa04373bca5044a3cb4d5125de792872e971ed2 (patch) | |
| tree | 303334b9cbed49a4cf950f952ce78764a0472f49 /drivers/hid | |
| parent | ce28dae326afd4d7087b9e57e6834050da657b28 (diff) | |
| parent | e9a081c80cb377b84ead0ba46e8ec892184318bd (diff) | |
| download | linux-0aa04373bca5044a3cb4d5125de792872e971ed2.tar.xz | |
Merge branch 'for-6.12/cp2112' into for-linus
- Use irq_get_trigger_type() helper (Jinjie Ruan)
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-cp2112.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 20a0d1315d90..dae2b84a1490 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -1094,7 +1094,6 @@ static void cp2112_gpio_poll_callback(struct work_struct *work) { struct cp2112_device *dev = container_of(work, struct cp2112_device, gpio_poll_worker.work); - struct irq_data *d; u8 gpio_mask; u32 irq_type; int irq, virq, ret; @@ -1111,12 +1110,10 @@ static void cp2112_gpio_poll_callback(struct work_struct *work) if (!irq) continue; - d = irq_get_irq_data(irq); - if (!d) + irq_type = irq_get_trigger_type(irq); + if (!irq_type) continue; - irq_type = irqd_get_trigger_type(d); - if (gpio_mask & BIT(virq)) { /* Level High */ |