summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Chung <nickchung@google.com>2022-12-27 05:59:56 +0000
committerHolmes Chou <holmeschou@google.com>2023-02-23 06:51:39 +0000
commitfa39f8bee6e78ee66c7aab5b63e47ed125ebf1d8 (patch)
tree5aeed88e13c32ce0a76cf2be7c9760718d841117
parentc77b913d949f27393956aa8cfe07f584a8b62d47 (diff)
downloadlwis-fa39f8bee6e78ee66c7aab5b63e47ed125ebf1d8.tar.gz
Revert "GPIO IRQ: Support GPIO IRQ event enable"
This reverts commit 1f4006197265f8f88b33caa74f2a58bbe5e657da. Reason for revert: Block GCA . Revert it first Change-Id: Iaee0e8ef509b3cba406a2cb7c119926cfcf228c9
-rw-r--r--lwis_event.c10
-rw-r--r--lwis_interrupt.c4
2 files changed, 1 insertions, 13 deletions
diff --git a/lwis_event.c b/lwis_event.c
index 8b15b0c..1d775f6 100644
--- a/lwis_event.c
+++ b/lwis_event.c
@@ -794,16 +794,6 @@ int lwis_device_event_enable(struct lwis_device *lwis_dev, int64_t event_id, boo
err = ret;
}
}
-
- if (lwis_dev->irq_gpios_info.irq_list) {
- ret = lwis_interrupt_event_enable(lwis_dev->irq_gpios_info.irq_list,
- event_id, enabled);
- if (ret && ret != -EINVAL) {
- dev_err(lwis_dev->dev, "Failed to %s GPIO IRQ event: %lld (e:%d)\n",
- enabled ? "enable" : "disable", event_id, ret);
- err = ret;
- }
- }
}
/* Check if our specialization cares about event updates */
if (!err && lwis_dev->vops.event_enable) {
diff --git a/lwis_interrupt.c b/lwis_interrupt.c
index ab3adcd..77ed8da 100644
--- a/lwis_interrupt.c
+++ b/lwis_interrupt.c
@@ -701,9 +701,7 @@ static int lwis_interrupt_single_event_enable_locked(struct lwis_interrupt *irq,
/* If mask_toggled is set, reverse the enable/disable logic. */
is_set = (!irq->mask_toggled) ? enabled : !enabled;
- if (event->int_reg_bit) {
- ret = lwis_interrupt_set_mask(irq, event->int_reg_bit, is_set);
- }
+ ret = lwis_interrupt_set_mask(irq, event->int_reg_bit, is_set);
return ret;
}