The OBJECT() macro is defined as:
#define OBJECT(obj) ((Object *)(obj))
Remove unnecessary OBJECT() casts.
Patch created mechanically using spatch with this script:
@@
typedef Object;
Object *o;
@@
- OBJECT(o)
+ o
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/core/bus.c | 2 +-
hw/ide/ahci-allwinner.c | 2 +-
hw/ipmi/smbus_ipmi.c | 2 +-
hw/microblaze/petalogix_ml605_mmu.c | 8 ++++----
hw/s390x/sclp.c | 2 +-
monitor/misc.c | 3 +--
qom/object.c | 4 ++--
7 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/hw/core/bus.c b/hw/core/bus.c
index 3dc0a825f0..4ea5870de8 100644
--- a/hw/core/bus.c
+++ b/hw/core/bus.c
@@ -25,7 +25,7 @@
void qbus_set_hotplug_handler(BusState *bus, Object *handler, Error **errp)
{
- object_property_set_link(OBJECT(bus), OBJECT(handler),
+ object_property_set_link(OBJECT(bus), handler,
QDEV_HOTPLUG_HANDLER_PROPERTY, errp);
}
diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c
index bb8393d2b6..8536b9eb5a 100644
--- a/hw/ide/ahci-allwinner.c
+++ b/hw/ide/ahci-allwinner.c
@@ -90,7 +90,7 @@ static void allwinner_ahci_init(Object *obj)
SysbusAHCIState *s = SYSBUS_AHCI(obj);
AllwinnerAHCIState *a = ALLWINNER_AHCI(obj);
- memory_region_init_io(&a->mmio, OBJECT(obj), &allwinner_ahci_mem_ops, a,
+ memory_region_init_io(&a->mmio, obj, &allwinner_ahci_mem_ops, a,
"allwinner-ahci", ALLWINNER_AHCI_MMIO_SIZE);
memory_region_add_subregion(&s->ahci.mem, ALLWINNER_AHCI_MMIO_OFF,
&a->mmio);
diff --git a/hw/ipmi/smbus_ipmi.c b/hw/ipmi/smbus_ipmi.c
index 2a9470d9df..f1a0148755 100644
--- a/hw/ipmi/smbus_ipmi.c
+++ b/hw/ipmi/smbus_ipmi.c
@@ -329,7 +329,7 @@ static void smbus_ipmi_init(Object *obj)
{
SMBusIPMIDevice *sid = SMBUS_IPMI(obj);
- ipmi_bmc_find_and_link(OBJECT(obj), (Object **) &sid->bmc);
+ ipmi_bmc_find_and_link(obj, (Object **) &sid->bmc);
}
static void smbus_ipmi_get_fwinfo(struct IPMIInterface *ii, IPMIFwInfo *info)
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index 0a2640c40b..52dcea9abd 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -150,9 +150,9 @@ petalogix_ml605_init(MachineState *machine)
qdev_set_nic_properties(eth0, &nd_table[0]);
qdev_prop_set_uint32(eth0, "rxmem", 0x1000);
qdev_prop_set_uint32(eth0, "txmem", 0x1000);
- object_property_set_link(OBJECT(eth0), OBJECT(ds),
+ object_property_set_link(OBJECT(eth0), ds,
"axistream-connected", &error_abort);
- object_property_set_link(OBJECT(eth0), OBJECT(cs),
+ object_property_set_link(OBJECT(eth0), cs,
"axistream-control-connected", &error_abort);
qdev_init_nofail(eth0);
sysbus_mmio_map(SYS_BUS_DEVICE(eth0), 0, AXIENET_BASEADDR);
@@ -163,9 +163,9 @@ petalogix_ml605_init(MachineState *machine)
cs = object_property_get_link(OBJECT(eth0),
"axistream-control-connected-target", NULL);
qdev_prop_set_uint32(dma, "freqhz", 100 * 1000000);
- object_property_set_link(OBJECT(dma), OBJECT(ds),
+ object_property_set_link(OBJECT(dma), ds,
"axistream-connected", &error_abort);
- object_property_set_link(OBJECT(dma), OBJECT(cs),
+ object_property_set_link(OBJECT(dma), cs,
"axistream-control-connected", &error_abort);
qdev_init_nofail(dma);
sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, AXIDMA_BASEADDR);
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index f0c35aa57a..bae9d2350f 100644
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -288,7 +288,7 @@ void s390_sclp_init(void)
object_property_add_child(qdev_get_machine(), TYPE_SCLP, new,
NULL);
- object_unref(OBJECT(new));
+ object_unref(new);
qdev_init_nofail(DEVICE(new));
}
diff --git a/monitor/misc.c b/monitor/misc.c
index 6c45fa490f..57af5fa5a4 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -1839,8 +1839,7 @@ void object_add_completion(ReadLineState *rs, int nb_args, const char *str)
static int qdev_add_hotpluggable_device(Object *obj, void *opaque)
{
GSList **list = opaque;
- DeviceState *dev = (DeviceState *)object_dynamic_cast(OBJECT(obj),
- TYPE_DEVICE);
+ DeviceState *dev = (DeviceState *)object_dynamic_cast(obj, TYPE_DEVICE);
if (dev == NULL) {
return 0;
diff --git a/qom/object.c b/qom/object.c
index 1812f79224..9893cc5459 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -762,7 +762,7 @@ Object *object_new_with_propv(const char *typename,
}
}
- object_unref(OBJECT(obj));
+ object_unref(obj);
return obj;
error:
@@ -1689,7 +1689,7 @@ void object_property_add_child(Object *obj, const char *name,
return;
}
- type = g_strdup_printf("child<%s>", object_get_typename(OBJECT(child)));
+ type = g_strdup_printf("child<%s>", object_get_typename(child));
op = object_property_add(obj, name, type, object_get_child_property, NULL,
object_finalize_child_property, child, &local_err);
--
2.21.1
On Sun, 12 Apr 2020 23:09:53 +0200 Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > The OBJECT() macro is defined as: > > #define OBJECT(obj) ((Object *)(obj)) > > Remove unnecessary OBJECT() casts. > > Patch created mechanically using spatch with this script: > > @@ > typedef Object; > Object *o; > @@ > - OBJECT(o) > + o > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/core/bus.c | 2 +- > hw/ide/ahci-allwinner.c | 2 +- > hw/ipmi/smbus_ipmi.c | 2 +- > hw/microblaze/petalogix_ml605_mmu.c | 8 ++++---- > hw/s390x/sclp.c | 2 +- > monitor/misc.c | 3 +-- > qom/object.c | 4 ++-- > 7 files changed, 11 insertions(+), 12 deletions(-) > s390x part: Acked-by: Cornelia Huck <cohuck@redhat.com>
On Sun, Apr 12, 2020 at 11:09:53PM +0200, Philippe Mathieu-Daudé wrote:
> The OBJECT() macro is defined as:
>
> #define OBJECT(obj) ((Object *)(obj))
>
> Remove unnecessary OBJECT() casts.
For ipmi change:
Acked-by: Corey Minyard <cminyard@mvista.com>
>
> Patch created mechanically using spatch with this script:
>
> @@
> typedef Object;
> Object *o;
> @@
> - OBJECT(o)
> + o
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/core/bus.c | 2 +-
> hw/ide/ahci-allwinner.c | 2 +-
> hw/ipmi/smbus_ipmi.c | 2 +-
> hw/microblaze/petalogix_ml605_mmu.c | 8 ++++----
> hw/s390x/sclp.c | 2 +-
> monitor/misc.c | 3 +--
> qom/object.c | 4 ++--
> 7 files changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/hw/core/bus.c b/hw/core/bus.c
> index 3dc0a825f0..4ea5870de8 100644
> --- a/hw/core/bus.c
> +++ b/hw/core/bus.c
> @@ -25,7 +25,7 @@
>
> void qbus_set_hotplug_handler(BusState *bus, Object *handler, Error **errp)
> {
> - object_property_set_link(OBJECT(bus), OBJECT(handler),
> + object_property_set_link(OBJECT(bus), handler,
> QDEV_HOTPLUG_HANDLER_PROPERTY, errp);
> }
>
> diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c
> index bb8393d2b6..8536b9eb5a 100644
> --- a/hw/ide/ahci-allwinner.c
> +++ b/hw/ide/ahci-allwinner.c
> @@ -90,7 +90,7 @@ static void allwinner_ahci_init(Object *obj)
> SysbusAHCIState *s = SYSBUS_AHCI(obj);
> AllwinnerAHCIState *a = ALLWINNER_AHCI(obj);
>
> - memory_region_init_io(&a->mmio, OBJECT(obj), &allwinner_ahci_mem_ops, a,
> + memory_region_init_io(&a->mmio, obj, &allwinner_ahci_mem_ops, a,
> "allwinner-ahci", ALLWINNER_AHCI_MMIO_SIZE);
> memory_region_add_subregion(&s->ahci.mem, ALLWINNER_AHCI_MMIO_OFF,
> &a->mmio);
> diff --git a/hw/ipmi/smbus_ipmi.c b/hw/ipmi/smbus_ipmi.c
> index 2a9470d9df..f1a0148755 100644
> --- a/hw/ipmi/smbus_ipmi.c
> +++ b/hw/ipmi/smbus_ipmi.c
> @@ -329,7 +329,7 @@ static void smbus_ipmi_init(Object *obj)
> {
> SMBusIPMIDevice *sid = SMBUS_IPMI(obj);
>
> - ipmi_bmc_find_and_link(OBJECT(obj), (Object **) &sid->bmc);
> + ipmi_bmc_find_and_link(obj, (Object **) &sid->bmc);
> }
>
> static void smbus_ipmi_get_fwinfo(struct IPMIInterface *ii, IPMIFwInfo *info)
> diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
> index 0a2640c40b..52dcea9abd 100644
> --- a/hw/microblaze/petalogix_ml605_mmu.c
> +++ b/hw/microblaze/petalogix_ml605_mmu.c
> @@ -150,9 +150,9 @@ petalogix_ml605_init(MachineState *machine)
> qdev_set_nic_properties(eth0, &nd_table[0]);
> qdev_prop_set_uint32(eth0, "rxmem", 0x1000);
> qdev_prop_set_uint32(eth0, "txmem", 0x1000);
> - object_property_set_link(OBJECT(eth0), OBJECT(ds),
> + object_property_set_link(OBJECT(eth0), ds,
> "axistream-connected", &error_abort);
> - object_property_set_link(OBJECT(eth0), OBJECT(cs),
> + object_property_set_link(OBJECT(eth0), cs,
> "axistream-control-connected", &error_abort);
> qdev_init_nofail(eth0);
> sysbus_mmio_map(SYS_BUS_DEVICE(eth0), 0, AXIENET_BASEADDR);
> @@ -163,9 +163,9 @@ petalogix_ml605_init(MachineState *machine)
> cs = object_property_get_link(OBJECT(eth0),
> "axistream-control-connected-target", NULL);
> qdev_prop_set_uint32(dma, "freqhz", 100 * 1000000);
> - object_property_set_link(OBJECT(dma), OBJECT(ds),
> + object_property_set_link(OBJECT(dma), ds,
> "axistream-connected", &error_abort);
> - object_property_set_link(OBJECT(dma), OBJECT(cs),
> + object_property_set_link(OBJECT(dma), cs,
> "axistream-control-connected", &error_abort);
> qdev_init_nofail(dma);
> sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, AXIDMA_BASEADDR);
> diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
> index f0c35aa57a..bae9d2350f 100644
> --- a/hw/s390x/sclp.c
> +++ b/hw/s390x/sclp.c
> @@ -288,7 +288,7 @@ void s390_sclp_init(void)
>
> object_property_add_child(qdev_get_machine(), TYPE_SCLP, new,
> NULL);
> - object_unref(OBJECT(new));
> + object_unref(new);
> qdev_init_nofail(DEVICE(new));
> }
>
> diff --git a/monitor/misc.c b/monitor/misc.c
> index 6c45fa490f..57af5fa5a4 100644
> --- a/monitor/misc.c
> +++ b/monitor/misc.c
> @@ -1839,8 +1839,7 @@ void object_add_completion(ReadLineState *rs, int nb_args, const char *str)
> static int qdev_add_hotpluggable_device(Object *obj, void *opaque)
> {
> GSList **list = opaque;
> - DeviceState *dev = (DeviceState *)object_dynamic_cast(OBJECT(obj),
> - TYPE_DEVICE);
> + DeviceState *dev = (DeviceState *)object_dynamic_cast(obj, TYPE_DEVICE);
>
> if (dev == NULL) {
> return 0;
> diff --git a/qom/object.c b/qom/object.c
> index 1812f79224..9893cc5459 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -762,7 +762,7 @@ Object *object_new_with_propv(const char *typename,
> }
> }
>
> - object_unref(OBJECT(obj));
> + object_unref(obj);
> return obj;
>
> error:
> @@ -1689,7 +1689,7 @@ void object_property_add_child(Object *obj, const char *name,
> return;
> }
>
> - type = g_strdup_printf("child<%s>", object_get_typename(OBJECT(child)));
> + type = g_strdup_printf("child<%s>", object_get_typename(child));
>
> op = object_property_add(obj, name, type, object_get_child_property, NULL,
> object_finalize_child_property, child, &local_err);
> --
> 2.21.1
>
On 4/12/20 5:09 PM, Philippe Mathieu-Daudé wrote: > - memory_region_init_io(&a->mmio, OBJECT(obj), &allwinner_ahci_mem_ops, a, > + memory_region_init_io(&a->mmio, obj, &allwinner_ahci_mem_ops, a, Acked-by: John Snow <jsnow@redhat.com>
© 2016 - 2026 Red Hat, Inc.