[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 37/40] ps2: remove unused legacy ps2_kbd_init() function
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 37/40] ps2: remove unused legacy ps2_kbd_init() function |
Date: |
Tue, 12 Jul 2022 22:52:48 +0100 |
Now that the legacy ps2_kbd_init() function is no longer used, it can be
completely
removed along with its associated trace-event.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Helge Deller <deller@gmx.de>
Acked-by: Helge Deller <deller@gmx.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/input/ps2.c | 13 -------------
hw/input/trace-events | 1 -
include/hw/input/ps2.h | 1 -
3 files changed, 15 deletions(-)
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 59bac28ac8..5b1728ef02 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -1224,19 +1224,6 @@ static void ps2_kbd_realize(DeviceState *dev, Error
**errp)
qemu_input_handler_register(dev, &ps2_keyboard_handler);
}
-void *ps2_kbd_init(void)
-{
- DeviceState *dev;
- PS2KbdState *s;
-
- dev = qdev_new(TYPE_PS2_KBD_DEVICE);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
- s = PS2_KBD_DEVICE(dev);
-
- trace_ps2_kbd_init(s);
- return s;
-}
-
static QemuInputHandler ps2_mouse_handler = {
.name = "QEMU PS/2 Mouse",
.mask = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL,
diff --git a/hw/input/trace-events b/hw/input/trace-events
index e0bfe7f3ee..df998d13eb 100644
--- a/hw/input/trace-events
+++ b/hw/input/trace-events
@@ -41,7 +41,6 @@ ps2_mouse_fake_event(void *opaque) "%p"
ps2_write_mouse(void *opaque, int val) "%p val %d"
ps2_kbd_reset(void *opaque) "%p"
ps2_mouse_reset(void *opaque) "%p"
-ps2_kbd_init(void *s) "%p"
ps2_mouse_init(void *s) "%p"
# hid.c
diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h
index a78619d8cb..18fd10cc75 100644
--- a/include/hw/input/ps2.h
+++ b/include/hw/input/ps2.h
@@ -98,7 +98,6 @@ struct PS2MouseState {
OBJECT_DECLARE_SIMPLE_TYPE(PS2MouseState, PS2_MOUSE_DEVICE)
/* ps2.c */
-void *ps2_kbd_init(void);
void *ps2_mouse_init(void);
void ps2_write_mouse(PS2MouseState *s, int val);
void ps2_write_keyboard(PS2KbdState *s, int val);
--
2.30.2
- [PATCH v2 28/40] lasips2: switch to using port-based IRQs, (continued)
- [PATCH v2 28/40] lasips2: switch to using port-based IRQs, Mark Cave-Ayland, 2022/07/12
- [PATCH v2 29/40] lasips2: rename LASIPS2Port parent pointer to lasips2, Mark Cave-Ayland, 2022/07/12
- [PATCH v2 30/40] lasips2: standardise on lp name for LASIPS2Port variables, Mark Cave-Ayland, 2022/07/12
- [PATCH v2 32/40] lasips2: don't use legacy ps2_kbd_init() function, Mark Cave-Ayland, 2022/07/12
- [PATCH v2 31/40] lasips2: switch register memory region to DEVICE_BIG_ENDIAN, Mark Cave-Ayland, 2022/07/12
- [PATCH v2 33/40] lasips2: don't use legacy ps2_mouse_init() function, Mark Cave-Ayland, 2022/07/12
- [PATCH v2 34/40] lasips2: update VMStateDescription for LASIPS2 device, Mark Cave-Ayland, 2022/07/12
- [PATCH v2 35/40] pckbd: introduce new vmstate_kbd_mmio VMStateDescription for the I8042_MMIO device, Mark Cave-Ayland, 2022/07/12
- [PATCH v2 36/40] pckbd: don't use legacy ps2_kbd_init() function, Mark Cave-Ayland, 2022/07/12
- [PATCH v2 39/40] ps2: remove unused legacy ps2_mouse_init() function, Mark Cave-Ayland, 2022/07/12
- [PATCH v2 37/40] ps2: remove unused legacy ps2_kbd_init() function,
Mark Cave-Ayland <=
- [PATCH v2 38/40] pckbd: don't use legacy ps2_mouse_init() function, Mark Cave-Ayland, 2022/07/12
- [PATCH v2 40/40] pckbd: remove legacy i8042_mm_init() function, Mark Cave-Ayland, 2022/07/12
- Re: [PATCH v2 00/40] PS2 device QOMification - part 2, Philippe Mathieu-Daudé, 2022/07/12
- Re: [PATCH v2 00/40] PS2 device QOMification - part 2, Mark Cave-Ayland, 2022/07/18