From patchwork Fri Feb 16 13:45:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 128592 Delivered-To: patches@linaro.org Received: by 10.46.124.24 with SMTP id x24csp579016ljc; Fri, 16 Feb 2018 05:45:19 -0800 (PST) X-Google-Smtp-Source: AH8x227EWBda8bHqJluM3iXCEfNeYEAIak78YgS1qsIDZBMQjeQQ04Upfzc83YHrwJ06nDg8hsSw X-Received: by 10.46.48.10 with SMTP id w10mr3906616ljw.76.1518788719569; Fri, 16 Feb 2018 05:45:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518788719; cv=none; d=google.com; s=arc-20160816; b=ROdDq6f7SLkUyANheHa7jvXMZ0z+FHiizgkYzgRurXsxs6pA2eWlsdzr2BILphnWvS ioWjC3XbU9Rc6wslu47TkpntfVbwVbvDPu3zuZg3IU6EzTRZJJ7vC66BYZtKmStYO9bH CyIUjpS0Ld90cc//ZZjmo19yDZgniwkzdhysWzhYB3xf/chpPfDwKW2qMmSMQK4DLZLO 5Fg6ywsdKilXyVfa5F3p763zo5zaNc6Bi1cpKPqU+Od4d7OPnPocaJB7fOo6WYGgX7L+ JakgRt/Uec8PZU/bZqBOOi8GcR3B8ACJAeBvfEPH+WX/Ta3zG0C/Aq/Jfhs/0wkkSBYS V1rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=15OpgahtenuipVIvXnD8Sqo4efWVFwUGOWFVeBMTcjk=; b=SQQnmJ0hgMPpqba04Fn3wpcfAQYWIu1aqjBE0IjONQeBE4Jq0d0XWKJJtuNCAEkh1h XeheFAcsqEi1egMSbRklmLEwLiH3wwslr11+r9gH2zFLWRhRz+u4maWOPI2G6HMHwMF9 fCfSqknMDEq9C0NwM0W+O/cvVzrOChZ66ZVsqERVz4X6UFViN+LMwtDOfIPgqyeO2atl ueHU3QvEA10Ddilf0DxzL6PepiEfVd9UEHbYrFkvL4tNPz45H1xKT18O+X6pLagdXfjV 6/kyp6gR1vNi+6t5sc+FprNAfdsR2nZLklBl7Zzy5JDUfnZV2knaZS32gDhxZr7xuFsc Yv6Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id w64si6287361lfk.372.2018.02.16.05.45.19 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Feb 2018 05:45:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1emgKE-0002y0-AH; Fri, 16 Feb 2018 13:45:18 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Paolo Bonzini , Stefan Hajnoczi Subject: [PATCH 2/2] hw/arm/bcm2835_peripherals: Use sysbus_init_child() Date: Fri, 16 Feb 2018 13:45:16 +0000 Message-Id: <20180216134516.6269-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216134516.6269-1-peter.maydell@linaro.org> References: <20180216134516.6269-1-peter.maydell@linaro.org> Use the new sysbus_init_child() function rather than opencoding the init-and-parent operations. This commit was created with coccinelle: spatch --in-place -sp_file sysbus-init-child.spatch --keep-comments hw/arm/bcm2835_peripherals.c and the following spatch file: @@ expression CHILD, CHILDTYPE, POBJ, CHILDNAME, ERREXPR; @@ - object_initialize(&CHILD, sizeof(CHILD), CHILDTYPE); - object_property_add_child(POBJ, CHILDNAME, OBJECT(&CHILD), ERREXPR); - qdev_set_parent_bus(DEVICE(&CHILD), sysbus_get_default()); + sysbus_init_child(POBJ, CHILDNAME, &CHILD, sizeof(CHILD), CHILDTYPE); Signed-off-by: Peter Maydell --- hw/arm/bcm2835_peripherals.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) -- 2.16.1 diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 13b63970d7..7968d611ef 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -41,9 +41,7 @@ static void bcm2835_peripherals_init(Object *obj) MBOX_CHAN_COUNT << MBOX_AS_CHAN_SHIFT); /* Interrupt Controller */ - object_initialize(&s->ic, sizeof(s->ic), TYPE_BCM2835_IC); - object_property_add_child(obj, "ic", OBJECT(&s->ic), NULL); - qdev_set_parent_bus(DEVICE(&s->ic), sysbus_get_default()); + sysbus_init_child(obj, "ic", &s->ic, sizeof(s->ic), TYPE_BCM2835_IC); /* UART0 */ s->uart0 = SYS_BUS_DEVICE(object_new("pl011")); @@ -51,14 +49,11 @@ static void bcm2835_peripherals_init(Object *obj) qdev_set_parent_bus(DEVICE(s->uart0), sysbus_get_default()); /* AUX / UART1 */ - object_initialize(&s->aux, sizeof(s->aux), TYPE_BCM2835_AUX); - object_property_add_child(obj, "aux", OBJECT(&s->aux), NULL); - qdev_set_parent_bus(DEVICE(&s->aux), sysbus_get_default()); + sysbus_init_child(obj, "aux", &s->aux, sizeof(s->aux), TYPE_BCM2835_AUX); /* Mailboxes */ - object_initialize(&s->mboxes, sizeof(s->mboxes), TYPE_BCM2835_MBOX); - object_property_add_child(obj, "mbox", OBJECT(&s->mboxes), NULL); - qdev_set_parent_bus(DEVICE(&s->mboxes), sysbus_get_default()); + sysbus_init_child(obj, "mbox", &s->mboxes, sizeof(s->mboxes), + TYPE_BCM2835_MBOX); object_property_add_const_link(OBJECT(&s->mboxes), "mbox-mr", OBJECT(&s->mbox_mr), &error_abort); @@ -86,32 +81,25 @@ static void bcm2835_peripherals_init(Object *obj) OBJECT(&s->gpu_bus_mr), &error_abort); /* Random Number Generator */ - object_initialize(&s->rng, sizeof(s->rng), TYPE_BCM2835_RNG); - object_property_add_child(obj, "rng", OBJECT(&s->rng), NULL); - qdev_set_parent_bus(DEVICE(&s->rng), sysbus_get_default()); + sysbus_init_child(obj, "rng", &s->rng, sizeof(s->rng), TYPE_BCM2835_RNG); /* Extended Mass Media Controller */ - object_initialize(&s->sdhci, sizeof(s->sdhci), TYPE_SYSBUS_SDHCI); - object_property_add_child(obj, "sdhci", OBJECT(&s->sdhci), NULL); - qdev_set_parent_bus(DEVICE(&s->sdhci), sysbus_get_default()); + sysbus_init_child(obj, "sdhci", &s->sdhci, sizeof(s->sdhci), + TYPE_SYSBUS_SDHCI); /* SDHOST */ - object_initialize(&s->sdhost, sizeof(s->sdhost), TYPE_BCM2835_SDHOST); - object_property_add_child(obj, "sdhost", OBJECT(&s->sdhost), NULL); - qdev_set_parent_bus(DEVICE(&s->sdhost), sysbus_get_default()); + sysbus_init_child(obj, "sdhost", &s->sdhost, sizeof(s->sdhost), + TYPE_BCM2835_SDHOST); /* DMA Channels */ - object_initialize(&s->dma, sizeof(s->dma), TYPE_BCM2835_DMA); - object_property_add_child(obj, "dma", OBJECT(&s->dma), NULL); - qdev_set_parent_bus(DEVICE(&s->dma), sysbus_get_default()); + sysbus_init_child(obj, "dma", &s->dma, sizeof(s->dma), TYPE_BCM2835_DMA); object_property_add_const_link(OBJECT(&s->dma), "dma-mr", OBJECT(&s->gpu_bus_mr), &error_abort); /* GPIO */ - object_initialize(&s->gpio, sizeof(s->gpio), TYPE_BCM2835_GPIO); - object_property_add_child(obj, "gpio", OBJECT(&s->gpio), NULL); - qdev_set_parent_bus(DEVICE(&s->gpio), sysbus_get_default()); + sysbus_init_child(obj, "gpio", &s->gpio, sizeof(s->gpio), + TYPE_BCM2835_GPIO); object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhci", OBJECT(&s->sdhci.sdbus), &error_abort);