Selaa lähdekoodia

hcd-dwc2: Rename USB_*CLASS macros for consistency

Rename the DWC2_CLASS to DWC2_USB_CLASS and DWC2_GET_CLASS to
DWC2_USB_GET_CLASS, for consistency with the DWC2_USB macro.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-15-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Eduardo Habkost 5 vuotta sitten
vanhempi
commit
79f6cf7e59
2 muutettua tiedostoa jossa 6 lisäystä ja 6 poistoa
  1. 4 4
      hw/usb/hcd-dwc2.c
  2. 2 2
      hw/usb/hcd-dwc2.h

+ 4 - 4
hw/usb/hcd-dwc2.c

@@ -1155,7 +1155,7 @@ static void dwc2_work_timer(void *opaque)
 
 
 static void dwc2_reset_enter(Object *obj, ResetType type)
 static void dwc2_reset_enter(Object *obj, ResetType type)
 {
 {
-    DWC2Class *c = DWC2_GET_CLASS(obj);
+    DWC2Class *c = DWC2_USB_GET_CLASS(obj);
     DWC2State *s = DWC2_USB(obj);
     DWC2State *s = DWC2_USB(obj);
     int i;
     int i;
 
 
@@ -1239,7 +1239,7 @@ static void dwc2_reset_enter(Object *obj, ResetType type)
 
 
 static void dwc2_reset_hold(Object *obj)
 static void dwc2_reset_hold(Object *obj)
 {
 {
-    DWC2Class *c = DWC2_GET_CLASS(obj);
+    DWC2Class *c = DWC2_USB_GET_CLASS(obj);
     DWC2State *s = DWC2_USB(obj);
     DWC2State *s = DWC2_USB(obj);
 
 
     trace_usb_dwc2_reset_hold();
     trace_usb_dwc2_reset_hold();
@@ -1253,7 +1253,7 @@ static void dwc2_reset_hold(Object *obj)
 
 
 static void dwc2_reset_exit(Object *obj)
 static void dwc2_reset_exit(Object *obj)
 {
 {
-    DWC2Class *c = DWC2_GET_CLASS(obj);
+    DWC2Class *c = DWC2_USB_GET_CLASS(obj);
     DWC2State *s = DWC2_USB(obj);
     DWC2State *s = DWC2_USB(obj);
 
 
     trace_usb_dwc2_reset_exit();
     trace_usb_dwc2_reset_exit();
@@ -1382,7 +1382,7 @@ static Property dwc2_usb_properties[] = {
 static void dwc2_class_init(ObjectClass *klass, void *data)
 static void dwc2_class_init(ObjectClass *klass, void *data)
 {
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
     DeviceClass *dc = DEVICE_CLASS(klass);
-    DWC2Class *c = DWC2_CLASS(klass);
+    DWC2Class *c = DWC2_USB_CLASS(klass);
     ResettableClass *rc = RESETTABLE_CLASS(klass);
     ResettableClass *rc = RESETTABLE_CLASS(klass);
 
 
     dc->realize = dwc2_realize;
     dc->realize = dwc2_realize;

+ 2 - 2
hw/usb/hcd-dwc2.h

@@ -182,9 +182,9 @@ struct DWC2Class {
 #define TYPE_DWC2_USB   "dwc2-usb"
 #define TYPE_DWC2_USB   "dwc2-usb"
 #define DWC2_USB(obj) \
 #define DWC2_USB(obj) \
     OBJECT_CHECK(DWC2State, (obj), TYPE_DWC2_USB)
     OBJECT_CHECK(DWC2State, (obj), TYPE_DWC2_USB)
-#define DWC2_CLASS(klass) \
+#define DWC2_USB_CLASS(klass) \
     OBJECT_CLASS_CHECK(DWC2Class, (klass), TYPE_DWC2_USB)
     OBJECT_CLASS_CHECK(DWC2Class, (klass), TYPE_DWC2_USB)
-#define DWC2_GET_CLASS(obj) \
+#define DWC2_USB_GET_CLASS(obj) \
     OBJECT_GET_CLASS(DWC2Class, (obj), TYPE_DWC2_USB)
     OBJECT_GET_CLASS(DWC2Class, (obj), TYPE_DWC2_USB)
 
 
 #endif
 #endif