From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA433C2BB85 for ; Tue, 14 Apr 2020 20:15:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 88D052074D for ; Tue, 14 Apr 2020 20:15:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mJCoiUdY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 88D052074D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jORyF-0002v4-NS for qemu-devel@archiver.kernel.org; Tue, 14 Apr 2020 16:15:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45537) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jORxE-0001ao-3d for qemu-devel@nongnu.org; Tue, 14 Apr 2020 16:14:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jORxC-0000xR-Ft for qemu-devel@nongnu.org; Tue, 14 Apr 2020 16:14:44 -0400 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]:44931) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jORx4-0000t4-63; Tue, 14 Apr 2020 16:14:34 -0400 Received: by mail-ot1-x344.google.com with SMTP id j4so1002786otr.11; Tue, 14 Apr 2020 13:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:reply-to:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=mLX84IN8sSpaz92RYC0ANtzxCMitNAqA4sbOvVucjpo=; b=mJCoiUdYoRM7BsTum32ML7Agu0C4P6FMxUYLKjEPjtiYcybq6tW8iSggBcahXP7d4R bnGktvqFGsWgmRhQ54tR1Xq4VyiJSPT5VPPCZcTIykTgRLBauHjLUz3348id95hsjBDQ HD7zQGNVP8E2qTJd0b1Ulx9/eQT/0/tQdB4pfuLzNc4+OdxNW9A8GMtcM8Q0IF7RHZB1 eK9FD5t+d7jRB/XFNKVSa0fviAZIeiSdIxfYNUILsQtPptIQbqGQxAGCyellpbPiuUpF D4TogO5XxC8oRyWymadXWPm7COV0+404o94OEIhtwcvoe9R5vDFHdgZqbqjQ0iwTIMdy vFoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :reply-to:references:mime-version:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=mLX84IN8sSpaz92RYC0ANtzxCMitNAqA4sbOvVucjpo=; b=PtDejNjPFr1Fi1rPBatX7phI+rsf95FVnzHisssIrExe3uqRw+HU3OmPyouzNEGuYq 4VxjwetcQBnrj/LNN5rKUMrLMEAq6MVQ2P4zxAhQzQZgXpgPQ5S2aXkES1a/Q529ZCnv hH9BepCC/iXgKAdHDGevwLCvdYaSEgJdvQLOi769aHAbZODVsWVQt9B+J/IYAB2CU+vh ehaH5X58vHZYLDB5aR9HehBvlyJhGGG90vu7xke9uqKMCLjJl2Le5H9wxz/qQMVciKrK NiaSpIFzz4Cxi8eItpgdbBgjLgQBOPqeQIcMAzoK7ZFbEKm2wSBDx3W0unlf6Ge4nDTw CZlw== X-Gm-Message-State: AGi0PuZxNJXywFaz/39ptr7SK6rjbHQpP6Rto1cB2KsMKHIVhf6ol6NC t+xW3Rb7LiUVuZQE7o1zeA== X-Google-Smtp-Source: APiQypIGoB5Eyg4ncuNb2evXXz4/xw4fG+Pdl2xoScwF5fOGf3jkrfXAflVNWOGomQiIqihkGDqf0Q== X-Received: by 2002:a9d:5512:: with SMTP id l18mr17601512oth.186.1586895272555; Tue, 14 Apr 2020 13:14:32 -0700 (PDT) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id i7sm5800480otl.12.2020.04.14.13.14.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 13:14:31 -0700 (PDT) Received: from minyard.net (unknown [IPv6:2001:470:b8f6:1b:8b39:c3f3:f502:5c4e]) by serve.minyard.net (Postfix) with ESMTPSA id 98082181888; Tue, 14 Apr 2020 20:14:30 +0000 (UTC) Date: Tue, 14 Apr 2020 15:14:29 -0500 From: Corey Minyard To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: Re: [PATCH-for-5.1 2/3] various: Remove unnecessary OBJECT() cast Message-ID: <20200414201429.GI3587@minyard.net> References: <20200412210954.32313-1-f4bug@amsat.org> <20200412210954.32313-3-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200412210954.32313-3-f4bug@amsat.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: minyard@acm.org Cc: Peter Maydell , David Hildenbrand , Jason Wang , Mark Cave-Ayland , qemu-devel@nongnu.org, Gerd Hoffmann , "Edgar E. Iglesias" , Stefano Stabellini , qemu-block@nongnu.org, Paul Durrant , Markus Armbruster , Halil Pasic , Christian Borntraeger , Aleksandar Markovic , Joel Stanley , Anthony Perard , xen-devel@lists.xenproject.org, David Gibson , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Eduardo Habkost , "Dr. David Alan Gilbert" , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Peter Chubb , =?utf-8?Q?C=C3=A9dric?= Le Goater , John Snow , Richard Henderson , Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= , Andrew Jeffery , Cornelia Huck , Laurent Vivier , qemu-ppc@nongnu.org, Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 > > Patch created mechanically using spatch with this script: > > @@ > typedef Object; > Object *o; > @@ > - OBJECT(o) > + o > > Signed-off-by: Philippe Mathieu-Daudé > --- > 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 >