diff mbox series

[21/23] hw/rtc/ds1338: Prefer DEFINE_TYPES() macro

Message ID 20240923093016.66437-22-shentey@gmail.com
State New
Headers show
Series E500 Cleanup | expand

Commit Message

Bernhard Beschow Sept. 23, 2024, 9:30 a.m. UTC 
---
 hw/rtc/ds1338.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

Comments

Cédric Le Goater Sept. 25, 2024, 3:42 p.m. UTC | #1 
Sob is missing.


Thanks,

C.

On 9/23/24 11:30, Bernhard Beschow wrote:
> ---
>   hw/rtc/ds1338.c | 20 ++++++++------------
>   1 file changed, 8 insertions(+), 12 deletions(-)
> 
> diff --git a/hw/rtc/ds1338.c b/hw/rtc/ds1338.c
> index a5fe221418..6de13caf99 100644
> --- a/hw/rtc/ds1338.c
> +++ b/hw/rtc/ds1338.c
> @@ -14,7 +14,6 @@
>   #include "hw/i2c/i2c.h"
>   #include "migration/vmstate.h"
>   #include "qemu/bcd.h"
> -#include "qemu/module.h"
>   #include "qom/object.h"
>   #include "sysemu/rtc.h"
>   
> @@ -227,16 +226,13 @@ static void ds1338_class_init(ObjectClass *klass, void *data)
>       dc->vmsd = &vmstate_ds1338;
>   }
>   
> -static const TypeInfo ds1338_info = {
> -    .name          = TYPE_DS1338,
> -    .parent        = TYPE_I2C_SLAVE,
> -    .instance_size = sizeof(DS1338State),
> -    .class_init    = ds1338_class_init,
> +static const TypeInfo types[] = {
> +    {
> +        .name          = TYPE_DS1338,
> +        .parent        = TYPE_I2C_SLAVE,
> +        .instance_size = sizeof(DS1338State),
> +        .class_init    = ds1338_class_init,
> +    },
>   };
>   
> -static void ds1338_register_types(void)
> -{
> -    type_register_static(&ds1338_info);
> -}
> -
> -type_init(ds1338_register_types)
> +DEFINE_TYPES(types)
diff mbox series

Patch

diff --git a/hw/rtc/ds1338.c b/hw/rtc/ds1338.c
index a5fe221418..6de13caf99 100644
--- a/hw/rtc/ds1338.c
+++ b/hw/rtc/ds1338.c
@@ -14,7 +14,6 @@ 
 #include "hw/i2c/i2c.h"
 #include "migration/vmstate.h"
 #include "qemu/bcd.h"
-#include "qemu/module.h"
 #include "qom/object.h"
 #include "sysemu/rtc.h"
 
@@ -227,16 +226,13 @@  static void ds1338_class_init(ObjectClass *klass, void *data)
     dc->vmsd = &vmstate_ds1338;
 }
 
-static const TypeInfo ds1338_info = {
-    .name          = TYPE_DS1338,
-    .parent        = TYPE_I2C_SLAVE,
-    .instance_size = sizeof(DS1338State),
-    .class_init    = ds1338_class_init,
+static const TypeInfo types[] = {
+    {
+        .name          = TYPE_DS1338,
+        .parent        = TYPE_I2C_SLAVE,
+        .instance_size = sizeof(DS1338State),
+        .class_init    = ds1338_class_init,
+    },
 };
 
-static void ds1338_register_types(void)
-{
-    type_register_static(&ds1338_info);
-}
-
-type_init(ds1338_register_types)
+DEFINE_TYPES(types)