From nobody Fri Dec 19 14:30:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1579271649; cv=none; d=zohomail.com; s=zohoarc; b=jtXPmHBCn07xdb3EjdzEpi/7xGHyi9vEKlruo61BM7LmOYKVtxrnxvVxIbApjGtD+0krEUCrFDF4cI0kVkoDt3fng36B4/SVrr7pvEv6UcGIGnc+9/QNVlIcoZtgvLS0Ob50Z1z7D79iJfWak8vsRXXJ+s5VcPSi9s8/KMzmH+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579271649; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9ihMRZaqTi8wqlyYAIMxsLPUqHE0JADm0wdNtQRrCbs=; b=OVsKS9M8Ing8x6Uu7ChMwIVGaXCIceGOChAEjV7OhN1r1VIsx8PqE2iwTti+ovgxk5YltHQIjydZqXMQO/2Ypagr2jy/DTl4JGB1cMbyEF0UB6PJYWosSFIuCg+NirO4o2IaSAYlX/fgdj06mRSqFe7hN1LQB16L5/MktQhQIvM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579271649238949.9300603897702; Fri, 17 Jan 2020 06:34:09 -0800 (PST) Received: from localhost ([::1]:58480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isShL-0003FP-FA for importer@patchew.org; Fri, 17 Jan 2020 09:34:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56561) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isSbw-0006MF-HX for qemu-devel@nongnu.org; Fri, 17 Jan 2020 09:28:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isSbv-00076u-Bf for qemu-devel@nongnu.org; Fri, 17 Jan 2020 09:28:32 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:44006) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isSbv-00075o-4t for qemu-devel@nongnu.org; Fri, 17 Jan 2020 09:28:31 -0500 Received: by mail-wr1-x443.google.com with SMTP id d16so22922164wre.10 for ; Fri, 17 Jan 2020 06:28:31 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e18sm33811146wrw.70.2020.01.17.06.28.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2020 06:28:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=9ihMRZaqTi8wqlyYAIMxsLPUqHE0JADm0wdNtQRrCbs=; b=N0vaTMbWxUDE/fgqtC3RnZEDFQsCKZ/RXUH+WBhECfYTOtwGiLuEAxq2kp/8Y75X/C OhTHmk93ZLUTMXM6x3DGG8C/C6983ERmlNxt8wNeJuEi6oECBh3lO7pcoo7qdjlHEDmn WDtaHhXZLoqEFcxQ7FIwVXSEjWt2NvxNj4z7fZixg+HSe5a9Ecf9StaG9+AT3sxjK672 ERZuhL/JdzBRKC7Iv5Yh5qjna+ZwLsUnP+yPPVnrw3PpU8utBjHE+FO81k2WLHGSHa+I DOBrakbFKreSVBJDA3eYHZohpmXJNU4P9Yq3yygqfv/tw+p2NMXa5kpWD7yVfg4aINJI HzCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9ihMRZaqTi8wqlyYAIMxsLPUqHE0JADm0wdNtQRrCbs=; b=WiBZRhP6csRaoAdnCRU5QLAfvXOQDflg8AMBhB2u1og9nu6RpTUmxzJVMWCA0pDWG5 TYh1X9kzT7UsbkQ4u62JRzrQVtgfR4cDnG751ZoQz4CISfRVIx/BCQfGn14s8WmjTVi8 JatLN2+1/MQJjZt5d5FfcPmUNO8yMjnN07/hkdF5IAJy05O7xWQ4V96qhbexUhAv40tl 8u6Z5+cwfJmn/FkUWL2ylXYIW9aCcRfIF0EWdCxQjAZY4xOUOFn6oD3z9MWqqmqSnTeK qBNHI17FjkbOnSo/Nx2Sa1tMkbgED0m0sjbckf5qEY+M86hBj9H+lH4fogUoIBvA3FLu 2TOA== X-Gm-Message-State: APjAAAXw2WAuVIM4WxMjJ5rXl6IS7vtaaniDw/k+qNa7IPhevxg1vJmc K3gKoml9hzOeCvy9kZMY+cFt/T8VvsmNUg== X-Google-Smtp-Source: APXvYqwv8nzOO3bkLkivAKXPKwe4Ue/J5QbihhHQ1dglM3GENIAeTlPDvllA/8/wwZyRVDofBNAcUA== X-Received: by 2002:adf:e2cf:: with SMTP id d15mr3381084wrj.225.1579271309878; Fri, 17 Jan 2020 06:28:29 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/15] hw/arm/allwinner-a10: Remove local qemu_irq variables Date: Fri, 17 Jan 2020 14:28:10 +0000 Message-Id: <20200117142816.15110-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200117142816.15110-1-peter.maydell@linaro.org> References: <20200117142816.15110-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 We won't reuse the CPU IRQ/FIQ variables. Simplify by calling qdev_get_gpio_in() in place. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20191230110953.25496-6-f4bug@amsat.org Signed-off-by: Peter Maydell Reviewed-by: Peter Maydell --- hw/arm/allwinner-a10.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index 966fbd4a6e5..1cde1656116 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -55,7 +55,6 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) { AwA10State *s =3D AW_A10(dev); SysBusDevice *sysbusdev; - qemu_irq fiq, irq; Error *err =3D NULL; =20 object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err); @@ -63,8 +62,6 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) error_propagate(errp, err); return; } - irq =3D qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ); - fiq =3D qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ); =20 object_property_set_bool(OBJECT(&s->intc), true, "realized", &err); if (err !=3D NULL) { @@ -73,8 +70,10 @@ static void aw_a10_realize(DeviceState *dev, Error **err= p) } sysbusdev =3D SYS_BUS_DEVICE(&s->intc); sysbus_mmio_map(sysbusdev, 0, AW_A10_PIC_REG_BASE); - sysbus_connect_irq(sysbusdev, 0, irq); - sysbus_connect_irq(sysbusdev, 1, fiq); + sysbus_connect_irq(sysbusdev, 0, + qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ)); + sysbus_connect_irq(sysbusdev, 1, + qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ)); qdev_pass_gpios(DEVICE(&s->intc), dev, NULL); =20 object_property_set_bool(OBJECT(&s->timer), true, "realized", &err); --=20 2.20.1