Merge branch 'for-6.12/cp2112' into for-linus

- Use irq_get_trigger_type() helper (Jinjie Ruan)
This commit is contained in:
Benjamin Tissoires 2024-09-13 16:04:30 +02:00
commit 0aa04373bc

View File

@ -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 */