Skip to content

Commit 0aa0437

Browse files
author
Benjamin Tissoires
committed
Merge branch 'for-6.12/cp2112' into for-linus
- Use irq_get_trigger_type() helper (Jinjie Ruan)
2 parents ce28dae + e9a081c commit 0aa0437

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

drivers/hid/hid-cp2112.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,6 @@ static void cp2112_gpio_poll_callback(struct work_struct *work)
10941094
{
10951095
struct cp2112_device *dev = container_of(work, struct cp2112_device,
10961096
gpio_poll_worker.work);
1097-
struct irq_data *d;
10981097
u8 gpio_mask;
10991098
u32 irq_type;
11001099
int irq, virq, ret;
@@ -1111,12 +1110,10 @@ static void cp2112_gpio_poll_callback(struct work_struct *work)
11111110
if (!irq)
11121111
continue;
11131112

1114-
d = irq_get_irq_data(irq);
1115-
if (!d)
1113+
irq_type = irq_get_trigger_type(irq);
1114+
if (!irq_type)
11161115
continue;
11171116

1118-
irq_type = irqd_get_trigger_type(d);
1119-
11201117
if (gpio_mask & BIT(virq)) {
11211118
/* Level High */
11221119

0 commit comments

Comments
 (0)