Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262460AbUKLGlL (ORCPT ); Fri, 12 Nov 2004 01:41:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262466AbUKLGjI (ORCPT ); Fri, 12 Nov 2004 01:39:08 -0500 Received: from smtp811.mail.sc5.yahoo.com ([66.163.170.81]:17310 "HELO smtp811.mail.sc5.yahoo.com") by vger.kernel.org with SMTP id S262468AbUKLGfL (ORCPT ); Fri, 12 Nov 2004 01:35:11 -0500 From: Dmitry Torokhov To: Vojtech Pavlik Subject: [PATCH 4/7] suppress duplicate serio events Date: Fri, 12 Nov 2004 01:31:51 -0500 User-Agent: KMail/1.6.2 Cc: LKML References: <200411120127.01473.dtor_core@ameritech.net> <200411120129.58520.dtor_core@ameritech.net> <200411120130.54103.dtor_core@ameritech.net> In-Reply-To: <200411120130.54103.dtor_core@ameritech.net> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <200411120131.54268.dtor_core@ameritech.net> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3566 Lines: 124 =================================================================== ChangeSet@1.1988, 2004-11-12 00:31:28-05:00, dtor_core@ameritech.net Input: rearrange serio event processing to get rid of duplicate events - do not sumbit event into the event queue if similar event has not been processed yet; also once event has been processed check the queue and delete events of the same type that have been accumulated in the mean time. Signed-off-by: Dmitry Torokhov serio.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 48 insertions(+), 9 deletions(-) =================================================================== diff -Nru a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c --- a/drivers/input/serio/serio.c 2004-11-12 01:00:47 -05:00 +++ b/drivers/input/serio/serio.c 2004-11-12 01:00:47 -05:00 @@ -120,13 +120,28 @@ static DECLARE_COMPLETION(serio_exited); static int serio_pid; -static void serio_queue_event(struct serio *serio, int event_type) +static void serio_queue_event(struct serio *serio, enum serio_event_type event_type) { unsigned long flags; struct serio_event *event; spin_lock_irqsave(&serio_event_lock, flags); + /* + * Scan event list for the other events for the same serio port, + * starting with the most recent one. If event is the same we + * do not need add new one. If event is of different type we + * need to add this event and should not look further because + * we need to preseve sequence of distinct events. + */ + list_for_each_entry_reverse(event, &serio_event_list, node) { + if (event->serio == serio) { + if (event->type == event_type) + goto out; + break; + } + } + if ((event = kmalloc(sizeof(struct serio_event), GFP_ATOMIC))) { event->type = event_type; event->serio = serio; @@ -135,9 +150,37 @@ wake_up(&serio_wait); } +out: + spin_unlock_irqrestore(&serio_event_lock, flags); +} + +static void serio_remove_duplicate_events(struct serio_event *event) +{ + struct list_head *node, *next; + struct serio_event *e; + unsigned long flags; + + spin_lock_irqsave(&serio_event_lock, flags); + + list_for_each_safe(node, next, &serio_event_list) { + e = container_of(node, struct serio_event, node); + if (event->serio == e->serio) { + /* + * If this event is of different type we should not + * look further - we only suppress duplicate events + * that were sent back-to-back. + */ + if (event->type != e->type) + break; /* Stop, when need to preserve event flow */ + list_del_init(node); + kfree(e); + } + } + spin_unlock_irqrestore(&serio_event_lock, flags); } + static struct serio_event *serio_get_event(void) { struct serio_event *event; @@ -192,6 +235,7 @@ } up(&serio_sem); + serio_remove_duplicate_events(event); kfree(event); } } @@ -637,14 +681,9 @@ if (likely(serio->drv)) { ret = serio->drv->interrupt(serio, data, dfl, regs); - } else { - if (!dfl) { - if ((serio->type != SERIO_8042 && - serio->type != SERIO_8042_XL) || (data == 0xaa)) { - serio_rescan(serio); - ret = IRQ_HANDLED; - } - } + } else if (!dfl) { + serio_rescan(serio); + ret = IRQ_HANDLED; } spin_unlock_irqrestore(&serio->lock, flags); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/