From: Mark Cave-Ayland Date: Tue, 12 Jul 2022 21:52:50 +0000 (+0100) Subject: ps2: remove unused legacy ps2_mouse_init() function X-Git-Tag: v7.1.0-rc0~14^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46e9783fbeabfac3c4f07c0de5e32d8c322f7a07;p=thirdparty%2Fqemu.git ps2: remove unused legacy ps2_mouse_init() function Now that the legacy ps2_mouse_init() function is no longer used, it can be completely removed along with its associated trace-event. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Acked-by: Helge Deller Reviewed-by: Peter Maydell Message-Id: <20220712215251.7944-40-mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé --- diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 5b1728ef02a..05cf7111e31 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -1236,19 +1236,6 @@ static void ps2_mouse_realize(DeviceState *dev, Error **errp) qemu_input_handler_register(dev, &ps2_mouse_handler); } -void *ps2_mouse_init(void) -{ - DeviceState *dev; - PS2MouseState *s; - - dev = qdev_new(TYPE_PS2_MOUSE_DEVICE); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - s = PS2_MOUSE_DEVICE(dev); - - trace_ps2_mouse_init(s); - return s; -} - static void ps2_kbd_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); diff --git a/hw/input/trace-events b/hw/input/trace-events index df998d13ebe..29001a827d9 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_mouse_init(void *s) "%p" # hid.c hid_kbd_queue_full(void) "queue full" diff --git a/include/hw/input/ps2.h b/include/hw/input/ps2.h index 18fd10cc758..ff777582cd6 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_mouse_init(void); void ps2_write_mouse(PS2MouseState *s, int val); void ps2_write_keyboard(PS2KbdState *s, int val); uint32_t ps2_read_data(PS2State *s);