On 8/14/20 12:25 AM, Eduardo Habkost wrote:
> Rename the DWC2_CLASS to DWC2_USB_CLASS and DWC2_GET_CLASS to
> DWC2_USB_GET_CLASS, for consistency with the DWC2_USB macro.
>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> hw/usb/hcd-dwc2.h | 4 ++--
> hw/usb/hcd-dwc2.c | 8 ++++----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/usb/hcd-dwc2.h b/hw/usb/hcd-dwc2.h
> index 4ba809a07b..54111d835e 100644
> --- a/hw/usb/hcd-dwc2.h
> +++ b/hw/usb/hcd-dwc2.h
> @@ -182,9 +182,9 @@ struct DWC2Class {
> #define TYPE_DWC2_USB "dwc2-usb"
> #define DWC2_USB(obj) \
> OBJECT_CHECK(DWC2State, (obj), TYPE_DWC2_USB)
> -#define DWC2_CLASS(klass) \
> +#define DWC2_USB_CLASS(klass) \
> 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)
>
> #endif
> diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c
> index 56f91f6bee..97688d21bf 100644
> --- a/hw/usb/hcd-dwc2.c
> +++ b/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)
> {
> - DWC2Class *c = DWC2_GET_CLASS(obj);
> + DWC2Class *c = DWC2_USB_GET_CLASS(obj);
> DWC2State *s = DWC2_USB(obj);
> int i;
>
> @@ -1239,7 +1239,7 @@ static void dwc2_reset_enter(Object *obj, ResetType
> type)
>
> 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);
>
> trace_usb_dwc2_reset_hold();
> @@ -1253,7 +1253,7 @@ static void dwc2_reset_hold(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);
>
> trace_usb_dwc2_reset_exit();
> @@ -1382,7 +1382,7 @@ static Property dwc2_usb_properties[] = {
> static void dwc2_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> - DWC2Class *c = DWC2_CLASS(klass);
> + DWC2Class *c = DWC2_USB_CLASS(klass);
> ResettableClass *rc = RESETTABLE_CLASS(klass);
>
> dc->realize = dwc2_realize;
>
