[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/27] dev-smartcard-reader: Rename CCID_DEV_NAME to TYPE_USB_CCID
From: |
Eduardo Habkost |
Subject: |
[PULL 16/27] dev-smartcard-reader: Rename CCID_DEV_NAME to TYPE_USB_CCID_DEV |
Date: |
Thu, 3 Sep 2020 16:52:36 -0400 |
This will make the type name constant consistent with the name of
the type checking macro.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200902224311.1321159-7-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/usb/dev-smartcard-reader.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 432508c478..59b2248f34 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)
--
2.26.2
- [PULL 03/27] qom: Allow class type name to be specified in OBJECT_DECLARE*, (continued)
- [PULL 03/27] qom: Allow class type name to be specified in OBJECT_DECLARE*, Eduardo Habkost, 2020/09/03
- [PULL 04/27] qom: DECLARE_*_CHECKERS macros, Eduardo Habkost, 2020/09/03
- [PULL 02/27] qom: provide convenient macros for declaring and defining types, Eduardo Habkost, 2020/09/03
- [PULL 05/27] qom: Make type checker functions accept const pointers, Eduardo Habkost, 2020/09/03
- [PULL 07/27] Delete duplicate QOM typedefs, Eduardo Habkost, 2020/09/03
- [PULL 06/27] codeconverter: script for automating QOM code cleanups, Eduardo Habkost, 2020/09/03
- [PULL 10/27] Use DECLARE_*CHECKER* when possible (--force mode), Eduardo Habkost, 2020/09/03
- [PULL 12/27] Use OBJECT_DECLARE_SIMPLE_TYPE when possible, Eduardo Habkost, 2020/09/03
- [PULL 13/27] gpex: Fix type checking function name, Eduardo Habkost, 2020/09/03
- [PULL 09/27] Use DECLARE_*CHECKER* macros, Eduardo Habkost, 2020/09/03
- [PULL 16/27] dev-smartcard-reader: Rename CCID_DEV_NAME to TYPE_USB_CCID_DEV,
Eduardo Habkost <=
- [PULL 14/27] chardev: Rename TYPE_CHARDEV_* to TYPE_*_CHARDEV, Eduardo Habkost, 2020/09/03
- [PULL 11/27] Use OBJECT_DECLARE_TYPE where possible, Eduardo Habkost, 2020/09/03
- [PULL 18/27] vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID, Eduardo Habkost, 2020/09/03
- [PULL 21/27] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER, Eduardo Habkost, 2020/09/03
- [PULL 24/27] usb: Rename USB_SERIAL_DEV to USB_SERIAL, Eduardo Habkost, 2020/09/03
- [PULL 26/27] pc87312: Rename TYPE_PC87312_SUPERIO to TYPE_PC87312, Eduardo Habkost, 2020/09/03
- [PULL 19/27] ahci: Rename ICH_AHCI to ICH9_AHCI, Eduardo Habkost, 2020/09/03
- [PULL 15/27] ap-device: Rename AP_DEVICE_TYPE to TYPE_AP_DEVICE, Eduardo Habkost, 2020/09/03
- [PULL 17/27] vfio: Rename VFIO_AP_DEVICE_TYPE to TYPE_VFIO_AP_DEVICE, Eduardo Habkost, 2020/09/03
- [PULL 20/27] esp: Rename ESP_STATE to ESP, Eduardo Habkost, 2020/09/03