From patchwork Mon May 9 20:20:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1628798 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=IHGpw5Ld; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4KxsyP3LtDz9sR4 for ; Tue, 10 May 2022 06:21:32 +1000 (AEST) Received: from localhost ([::1]:60918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1no9sm-0000qC-G0 for incoming@patchwork.ozlabs.org; Mon, 09 May 2022 16:21:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no9s3-0000pw-Gg; Mon, 09 May 2022 16:20:43 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:35559) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1no9s1-0008KT-SB; Mon, 09 May 2022 16:20:43 -0400 Received: by mail-wr1-x433.google.com with SMTP id j15so21012617wrb.2; Mon, 09 May 2022 13:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kcvql3wXVAMOWdcWNPkxojqFp5MRkSepFQ1so1DkkYI=; b=IHGpw5LdRePYtSDdv+078f3i/QIkTIsWA9cgC2IytFAIyyI9BbSkNxIeRTt05k7liC bTNjg4s4wAWhWQ6qwz6ha9OfZpXGWkol5XdXhrZqOJ/Ys1BEZ/HAthoARRavHM2i43K/ uLphlSzHgpj4EhzsSAojDTdyMOsZC+Ee2D8izyhH9AGKwLNfFiYOfl7kctY0WCzo06bb a1/scilpZh9y3ZClb4E5NNravoP5zaVfg6AtPStmA2hMT3IZFRSAuQeWiNV11sb3DJtK RBSZ5Xt7/ij3N+so6NabUR6NEiG0ve7NJLkmjmO+It6JKB+YE7IjqLsiaxTO0WCgLMQo IagQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=kcvql3wXVAMOWdcWNPkxojqFp5MRkSepFQ1so1DkkYI=; b=qoe49jRye0acvGrT4vZYgBR44GBkyrhJvbKrF7B3H5HT7nh+60iq7fGrfufa/MdjMa wp1cxr6Wc+WbbWj9Fmr9crAsbklZiA3HhlktF7zxX5rLYsgRoHBbpSIwjBKg+lmaTNiQ pWCLNV5a6DFv0aT2rWlJGZxgYDF/2BlNgklrIcApPvJ9AuiYDBcoQ50DR+HuSkXqAtaN Xcrb4sqqLshNu+95Y2bFr9ntMQ8X2RNabZ9lG7C8V5KpLC5o/HSNY6KT9e5Q6Kevl0Id d6cOEOoF7WdnVOiQXPkEKGu823ypLc0cWJHNSLUadxaoRMucL8wA3TIBlPMpKjb12NDK fGYA== X-Gm-Message-State: AOAM533xkNgmczG2wYvEOUYnwqlCOrjNS1b+1NdiOBBC3ja+j8Ur32gn bAfPHnbj3EwnNI/H9yf/umlprc0olDk= X-Google-Smtp-Source: ABdhPJxF52fNOjXuip6YO1xtkgb9GShNAMTR/Kg7hjBiGv/iq+7JMOaTpBJhtFEQHnRxNQpDzHrGLw== X-Received: by 2002:adf:e5cd:0:b0:20a:f3d9:3376 with SMTP id a13-20020adfe5cd000000b0020af3d93376mr15518822wrn.228.1652127637984; Mon, 09 May 2022 13:20:37 -0700 (PDT) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id z15-20020a05600c220f00b00394538d039esm311094wml.6.2022.05.09.13.20.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 May 2022 13:20:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alistair Francis , Bernhard Beschow , qemu-arm@nongnu.org, Peter Maydell , "Edgar E. Iglesias" , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH] hw/adc/zynq-xadc: Use qemu_irq typedef Date: Mon, 9 May 2022 22:20:35 +0200 Message-Id: <20220509202035.50335-1-philippe.mathieu.daude@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Except hw/core/irq.c which implements the forward-declared opaque qemu_irq structure, hw/adc/zynq-xadc.{c,h} are the only files not using the typedef. Fix this single exception. Signed-off-by: Philippe Mathieu-Daudé Reviewed-By: Bernhard Beschow --- hw/adc/zynq-xadc.c | 4 ++-- include/hw/adc/zynq-xadc.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/adc/zynq-xadc.c b/hw/adc/zynq-xadc.c index cfc7bab065..032e19cbd0 100644 --- a/hw/adc/zynq-xadc.c +++ b/hw/adc/zynq-xadc.c @@ -86,7 +86,7 @@ static void zynq_xadc_update_ints(ZynqXADCState *s) s->regs[INT_STS] |= INT_DFIFO_GTH; } - qemu_set_irq(s->qemu_irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK])); + qemu_set_irq(s->irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK])); } static void zynq_xadc_reset(DeviceState *d) @@ -262,7 +262,7 @@ static void zynq_xadc_init(Object *obj) memory_region_init_io(&s->iomem, obj, &xadc_ops, s, "zynq-xadc", ZYNQ_XADC_MMIO_SIZE); sysbus_init_mmio(sbd, &s->iomem); - sysbus_init_irq(sbd, &s->qemu_irq); + sysbus_init_irq(sbd, &s->irq); } static const VMStateDescription vmstate_zynq_xadc = { diff --git a/include/hw/adc/zynq-xadc.h b/include/hw/adc/zynq-xadc.h index 2017b7a803..c10cc4c379 100644 --- a/include/hw/adc/zynq-xadc.h +++ b/include/hw/adc/zynq-xadc.h @@ -39,8 +39,7 @@ struct ZynqXADCState { uint16_t xadc_dfifo[ZYNQ_XADC_FIFO_DEPTH]; uint16_t xadc_dfifo_entries; - struct IRQState *qemu_irq; - + qemu_irq irq; }; #endif /* ZYNQ_XADC_H */