Commit 688ffbb4 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Markus Armbruster
Browse files

various: Remove unnecessary OBJECT() cast 



The OBJECT() macro is defined as:

  #define OBJECT(obj) ((Object *)(obj))

Remove the unnecessary OBJECT() casts when we already know the
pointer is of Object type.

Patch created mechanically using spatch with this script:

  @@
  typedef Object;
  Object *o;
  @@
  -   OBJECT(o)
  +   o

Acked-by: default avatarCornelia Huck <cohuck@redhat.com>
Acked-by: default avatarCorey Minyard <cminyard@mvista.com>
Acked-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200512070020.22782-3-f4bug@amsat.org>
[Trivial rebase conflict in hw/s390x/sclp.c resolved]
parent 96449e4a

hw/core/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

hw/ide/ahci-allwinner.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

hw/ipmi/smbus_ipmi.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

hw/microblaze/petalogix_ml605_mmu.c

+4 −4
Original line number Diff line number Diff line
@@ -148,9 +148,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);
@@ -161,9 +161,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);

hw/s390x/sclp.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ void s390_sclp_init(void) 
    Object *new = object_new(TYPE_SCLP);



    object_property_add_child(qdev_get_machine(), TYPE_SCLP, new);

    object_unref(OBJECT(new));

    object_unref(new);

    qdev_init_nofail(DEVICE(new));

}