From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Date: Fri, 24 Jun 2022 13:40:47 +0000 (+0100)
Subject: ps2: use ps2_raise_irq() instead of calling update_irq() directly
X-Git-Tag: v7.1.0-rc0~50^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=892e9bbe595e31e7e0a3734d25091c75f56fc9a9;p=thirdparty%2Fqemu.git

ps2: use ps2_raise_irq() instead of calling update_irq() directly

This consolidates the logic of raising the PS2 IRQ into one single function.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220624134109.881989-33-mark.cave-ayland@ilande.co.uk>
---

diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 24c9853d37c..a14281bc548 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -557,7 +557,7 @@ uint32_t ps2_read_data(PS2State *s)
         s->update_irq(s->update_arg, 0);
         /* reassert IRQs if data left */
         if (q->count) {
-            s->update_irq(s->update_arg, 1);
+            ps2_raise_irq(s);
         }
     }
     return val;