From: Eduardo Habkost Date: Wed, 2 Sep 2020 22:42:14 +0000 (-0400) Subject: dev-smartcard-reader: Rename CCID_DEV_NAME to TYPE_USB_CCID_DEV X-Git-Tag: v5.2.0-rc0~122^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f46ed2b38284821824f22cf51679703c986fd11;p=thirdparty%2Fqemu.git dev-smartcard-reader: Rename CCID_DEV_NAME to TYPE_USB_CCID_DEV This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200902224311.1321159-7-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 432508c478c..59b2248f349 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -60,10 +60,10 @@ do { \ #define D_MORE_INFO 3 #define D_VERBOSE 4 -#define CCID_DEV_NAME "usb-ccid" +#define TYPE_USB_CCID_DEV "usb-ccid" typedef struct USBCCIDState USBCCIDState; DECLARE_INSTANCE_CHECKER(USBCCIDState, USB_CCID_DEV, - CCID_DEV_NAME) + TYPE_USB_CCID_DEV) /* * The two options for variable sized buffers: * make them constant size, for large enough constant, @@ -1462,7 +1462,7 @@ static void ccid_class_initfn(ObjectClass *klass, void *data) } static const TypeInfo ccid_info = { - .name = CCID_DEV_NAME, + .name = TYPE_USB_CCID_DEV, .parent = TYPE_USB_DEVICE, .instance_size = sizeof(USBCCIDState), .class_init = ccid_class_initfn, @@ -1495,7 +1495,7 @@ static void ccid_register_types(void) type_register_static(&ccid_bus_info); type_register_static(&ccid_card_type_info); type_register_static(&ccid_info); - usb_legacy_register(CCID_DEV_NAME, "ccid", NULL); + usb_legacy_register(TYPE_USB_CCID_DEV, "ccid", NULL); } type_init(ccid_register_types)