qom: Rename macros for consistency (pass 2)

[PATCH 8/8] tusb6010: Rename TUSB to TUSB6010

Posted by Eduardo Habkost 5 years, 2 months ago

Make type checking function name consistent with the TYPE_TUSB6010
constant and QOM type name ("tusb6010").

Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Suggested-by: "Daniel P. Berrangé" <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Changes v1 -> v2:
* v1 subject was "tusb6010: Rename TYPE_TUSB6010 to TYPE_TUSB"
* Rename TUSB macro to TUSB6010 instead, to keep it consistent
  with the QOM type name ("tusb6010")
---
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org
---
 hw/usb/tusb6010.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c
index 2bee3ae59f..dd20996d13 100644
--- a/hw/usb/tusb6010.c
+++ b/hw/usb/tusb6010.c
@@ -32,7 +32,7 @@
 
 #define TYPE_TUSB6010 "tusb6010"
 typedef struct TUSBState TUSBState;
-DECLARE_INSTANCE_CHECKER(TUSBState, TUSB,
+DECLARE_INSTANCE_CHECKER(TUSBState, TUSB6010,
                          TYPE_TUSB6010)
 
 struct TUSBState {
@@ -779,7 +779,7 @@ static void tusb6010_irq(void *opaque, int source, int level)
 
 static void tusb6010_reset(DeviceState *dev)
 {
-    TUSBState *s = TUSB(dev);
+    TUSBState *s = TUSB6010(dev);
     int i;
 
     s->test_reset = TUSB_PROD_TEST_RESET_VAL;
@@ -815,7 +815,7 @@ static void tusb6010_reset(DeviceState *dev)
 
 static void tusb6010_realize(DeviceState *dev, Error **errp)
 {
-    TUSBState *s = TUSB(dev);
+    TUSBState *s = TUSB6010(dev);
     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
 
     s->otg_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_otg_tick, s);
-- 
2.26.2

Re: [PATCH 8/8] tusb6010: Rename TUSB to TUSB6010

Posted by Philippe Mathieu-Daudé 5 years, 2 months ago

On 9/3/20 8:01 PM, Eduardo Habkost wrote:
> Make type checking function name consistent with the TYPE_TUSB6010
> constant and QOM type name ("tusb6010").
> 
> Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Suggested-by: "Daniel P. Berrangé" <berrange@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Changes v1 -> v2:
> * v1 subject was "tusb6010: Rename TYPE_TUSB6010 to TYPE_TUSB"
> * Rename TUSB macro to TUSB6010 instead, to keep it consistent
>   with the QOM type name ("tusb6010")

Thanks!

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [PATCH 8/8] tusb6010: Rename TUSB to TUSB6010

Posted by Daniel P. Berrangé 5 years, 2 months ago

On Thu, Sep 03, 2020 at 02:01:28PM -0400, Eduardo Habkost wrote:
> Make type checking function name consistent with the TYPE_TUSB6010
> constant and QOM type name ("tusb6010").
> 
> Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Suggested-by: "Daniel P. Berrangé" <berrange@redhat.com>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Changes v1 -> v2:
> * v1 subject was "tusb6010: Rename TYPE_TUSB6010 to TYPE_TUSB"
> * Rename TUSB macro to TUSB6010 instead, to keep it consistent
>   with the QOM type name ("tusb6010")
> ---
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: qemu-devel@nongnu.org
> ---
>  hw/usb/tusb6010.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|