From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673277840; cv=none; d=zohomail.com; s=zohoarc; b=QixAJAL2pU7/xgXYGZ00sIUU6cf/1hVs8psPU0qYVO5ao0w46opPAE+U+ZbhDie78GlXLmEmty6Cd5r6heAIp7/DEzmMtSsC6vhXHtEJj7hJBhYQzkUxuVa7Dfg7Jbpw+lgfVVIoKOTmbnBs9Bb0kIvo+z5JgVe2IukMfxitjh4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673277840; h=Content-Type:Content-Transfer-Encoding:Cc: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=vc7oXCtsr3pijTnNXlGB2vSCQsuIsAnHG1xgG7SBnTk=; b=T77XEZjPOCzvjZVPNhBMQW5zA1yIaI55h4/UCsqvIboZsc+lhzrxHYBHoLYJqfvwSTvB1UTsGE2JTUz9PblOTB95GMrsqQIi1C9S7SJh5YRsqVAY2hJnk/eZvNOqdZgXQVN+Q5MZXoHuMBR0nUXgb+qC/piRh+ynM7Oufcwugwo= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673277840875776.3497552596854; Mon, 9 Jan 2023 07:24:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEskB-0001Ti-PY; Mon, 09 Jan 2023 09:03:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEsk9-0001Sd-DW for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:17 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEsk7-0006Mw-OM for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:17 -0500 Received: by mail-wm1-x32a.google.com with SMTP id m26-20020a05600c3b1a00b003d9811fcaafso6840797wms.5 for ; Mon, 09 Jan 2023 06:03:15 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id y15-20020adffa4f000000b002bbec19c8acsm3360723wrr.64.2023.01.09.06.03.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:03:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vc7oXCtsr3pijTnNXlGB2vSCQsuIsAnHG1xgG7SBnTk=; b=t9NaCskv6wFywzyEZtQ0FyfV6dwqBWDdvmC3/s21Lsm7zi5mx4X8VbnQthKeH+dROk AHsw941MU+9huLHVHbyiw7O56BzTwRXWZnjcnF1eFsqfyUzk0Tzcc2JxrSs5MTjveuxm 2asE4dLF+d5Q3+4l2C98GiIYZ+wD5pYH+jn9QPp/Oykubp6KIDAJpm051nJuaCg7CKys dEFhMPsvxK1o7JpOgqRI+RwCAggrtTHpKq1a48aWpxAs3nPxeofWDU2N+2XQmKa8pVYc Giv2bIegAOzz1qcMogKES42+7ZQREmAv1mbrO9MyOcd/IWjBgLnvUYsImCFnsV3vbTEh hIdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vc7oXCtsr3pijTnNXlGB2vSCQsuIsAnHG1xgG7SBnTk=; b=qHDgNkj18MQ0S1QX3Zu8exxnwUrtKs/KYMB6Zicognw4R+QY09IXiPpIIJgL71wEAB 5qOTKWJUbPQLYG8ZFfwitfKskkKynPUCy0+E9QF4GbEAeSjwENaOcVjWpJgISjfIWjfl EE3uGDzDsVA88DLnXAvIuaE6/kG/78b4jovCttSjuGiss+pRs5ppqLxHLGJ5AIhJl3zu msjFU/ODMaWpYzqAFw5Ll/utVXteCNb08oGfM4eoZnxT6Aum5b4aSCZGm4oQJ1z22kY5 wnYjB0pJh5aBb4SoO/T7q3MUpCm1lLYTOTowh1ift3YKwz4K3Kmnx8YNogm3nybraJQU aibA== X-Gm-Message-State: AFqh2kpq2ySJ6i48okdfp4jJ0ZjQ4UJAyABmBkbrHKcmh3X5Gbkw9gFW msIlsivDcwOMgM4BAyxxpqj/BieXdCJRWe+j X-Google-Smtp-Source: AMrXdXuaN6t6xmcUSLjWcFeCFEEzFbTqLJa1iy4sFKQkaH7DA8caFRRdqqn6+LL4LmSb6Ym98DFZng== X-Received: by 2002:a05:600c:15c3:b0:3d1:c8e4:48d7 with SMTP id v3-20020a05600c15c300b003d1c8e448d7mr56219326wmf.40.1673272993818; Mon, 09 Jan 2023 06:03:13 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 01/14] hw/arm/pxa: Avoid forward-declaring PXA2xxI2CState Date: Mon, 9 Jan 2023 15:02:53 +0100 Message-Id: <20230109140306.23161-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673277842790100003 To avoid forward-declaring PXA2xxI2CState, declare PXA2XX_I2C before its use in pxa2xx_i2c_init() prototype. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/arm/pxa.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h index 1095504b86..cdbff85afe 100644 --- a/include/hw/arm/pxa.h +++ b/include/hw/arm/pxa.h @@ -119,14 +119,14 @@ void pxa27x_register_keypad(PXA2xxKeyPadState *kp, const struct keymap *map, int size); =20 /* pxa2xx.c */ -typedef struct PXA2xxI2CState PXA2xxI2CState; +#define TYPE_PXA2XX_I2C "pxa2xx_i2c" +OBJECT_DECLARE_SIMPLE_TYPE(PXA2xxI2CState, PXA2XX_I2C) + PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base, qemu_irq irq, uint32_t page_size); I2CBus *pxa2xx_i2c_bus(PXA2xxI2CState *s); =20 -#define TYPE_PXA2XX_I2C "pxa2xx_i2c" typedef struct PXA2xxI2SState PXA2xxI2SState; -OBJECT_DECLARE_SIMPLE_TYPE(PXA2xxI2CState, PXA2XX_I2C) =20 #define TYPE_PXA2XX_FIR "pxa2xx-fir" OBJECT_DECLARE_SIMPLE_TYPE(PXA2xxFIrState, PXA2XX_FIR) --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673275572; cv=none; d=zohomail.com; s=zohoarc; b=d82BuCiTNar+wEGfvfNkzZS+ztf2AnE9HO3G+qNYjsh2pMBfedGC9O3TYaEGGT8bBuPSVPYmLkPDnwUDJ37RaDGgG2oDjem4gNiuwY879K4iGqubMa1sDWAl3rs9qng5ILUup/xcIYyc38oo8SxO8t0eELrcDD5eLZhbngD9kYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673275572; h=Content-Type:Content-Transfer-Encoding:Cc: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=bwgSmpYYfKNOJH9VNo91pDyRjQC6uHyPY7rBYpr5GJw=; b=ewW2ojOFsrGrOyHY2iwYR2yIm3yqlG72rCmQtoEW3Tdxx+XNMwicyiYjMwCeDSvMcROMMllksVsUcBV5NKxoEZUyDcqE6LESXwVkI+EH2QieBehqFh5B/WAZiZ1TT7OGfmC99X9yFqp1EeS4VFIQJAZFLJIxkPMuGpc9ixqYBGA= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673275572456900.4950634432199; Mon, 9 Jan 2023 06:46:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEskJ-0001W3-U8; Mon, 09 Jan 2023 09:03:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEskE-0001Us-BT for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:22 -0500 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEskC-0006PJ-QJ for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:22 -0500 Received: by mail-lj1-x22f.google.com with SMTP id bx6so8968638ljb.3 for ; Mon, 09 Jan 2023 06:03:20 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id g14-20020a05600c4ece00b003d9ea176d54sm8462614wmq.27.2023.01.09.06.03.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:03:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bwgSmpYYfKNOJH9VNo91pDyRjQC6uHyPY7rBYpr5GJw=; b=n5l0+iz3gjBqrKMaIv4+T2CnMxiqzpa1hiMPKWzCyUfaTtojUJTY4jj5noYtmix0PU WS+D4c+1/EkUT4KFu+mj6Xyn9iJ3AruoKivNMKkPV4Ay4HFppmY85TjPqPkZdlUWZ6vP hnVu5URMcS4CxhN32ApAlobFr7VBiX81tgtQ8IXZYaYxsZFp6mMmA/gZQu3yAmr8Z9tN Bh/LbpRBx+vWNau7Q24i2UBR3ipVIv+dkh39gH9fwMvER3FVriZ8gV5dHX+xQSCC8Zd+ CX1JTGRTmuEePqgLJLphOq2M68TEql69VtuudYcS8/cM3kuslBZL3JDP7+qhuZtnt05s FHJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bwgSmpYYfKNOJH9VNo91pDyRjQC6uHyPY7rBYpr5GJw=; b=LWmYryJOOPNlYtdyJrciJDHbTmW2kKLogJ8ytVq3qga64E3VPdfVNFUlvmPEYYhXX1 ao7X6oL5/l2jsQEXs3himZHBKxBaRZOw/gn2h1m8HAk2ib91WSa1BOhFbfAA0hwDd8b5 AzVGRYzEhnVeY292oDzNo8Ohcv2sCS5ZhBUcjxSz2v3wMH/7kxmKeb4ISbM9w4FEqJdy kdfOpvzqVIbL3oLmjzR33//wfGxdZ5Wkjugvggzu85w8jGFNKDBZluO8UW3Z5dsTitfq k+aZYgwI14+PjF1OI8ttN+ZT7P0suPwLmlvAbEKRKov2uPjx66Cc6L+nVvRiNsnHfLxj PTIw== X-Gm-Message-State: AFqh2krg4Pl1C1v7P3mCr4LSu+fZkhtpk/zcrCGuSmpnxoLdJ+IRKbFi CBiIPbSG4UbrRD2u6pKfyT+cu/al0T3kvm/L X-Google-Smtp-Source: AMrXdXv3Wlqjo4bB4Dp28JEiHBg6Elrz4J6qQwBzU8sNyBeu0hptpHpr41XhlF6z05/YraEl7J80Pw== X-Received: by 2002:a2e:9e57:0:b0:281:789:7ee5 with SMTP id g23-20020a2e9e57000000b0028107897ee5mr4320882ljk.6.1673272998739; Mon, 09 Jan 2023 06:03:18 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 02/14] hw/gpio/omap_gpio: Add local variable to avoid embedded cast Date: Mon, 9 Jan 2023 15:02:54 +0100 Message-Id: <20230109140306.23161-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=philmd@linaro.org; helo=mail-lj1-x22f.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673275573776100002 Add a local 'struct omap_gpif_s *' variable to improve readability. (This also eases next commit conversion). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/gpio/omap_gpio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index bd0841d57f..12ec16d1b0 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -53,7 +53,8 @@ struct omap_gpif_s { /* General-Purpose I/O of OMAP1 */ static void omap_gpio_set(void *opaque, int line, int level) { - struct omap_gpio_s *s =3D &((struct omap_gpif_s *) opaque)->omap1; + struct omap_gpif_s *p =3D opaque; + struct omap_gpio_s *s =3D &p->omap1; uint16_t prev =3D s->inputs; =20 if (level) --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673275541; cv=none; d=zohomail.com; s=zohoarc; b=Kwf5kOulxQoPje4htCZ9tR2Igea3WGHN8cAQYARNHKpzlJx7omv3+cvgrryTVEgrzIE7eHfxT/Dt2UgUiiYgB9HlKqCkuYIyZY+4ecNbDNiIuiyG0hp0jfYR6gWSEKxvxtJC0nI5AcBO+ELJNaeZla9c3NqFEr9t9umhwC5V3PI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673275541; h=Content-Type:Content-Transfer-Encoding:Cc: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=qBqD1jL6rd3oQZEY1EzugDeM7Ut5P0fq+XRGKO9OmYs=; b=k+7xRl/2+FCpCmfyAlr8WvJX2g2sWbfx3bk9SlmSjMb93P1Yurom2vmdbrNcuGDFDEfJ3FcQud2b6l/hd06D4CB1z3swIAQZLr1lhJNGjGXuQPcI4U68jqTLKYf8vmdwCPAUC9iVuQfUPeVrUjjf5GwvMqTIk8h57iOIt6zgcwk= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673275541511356.6023908056528; Mon, 9 Jan 2023 06:45:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEskR-0001Yu-GG; Mon, 09 Jan 2023 09:03:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEskQ-0001YU-Aw for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:34 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEskI-0006QI-Ff for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:34 -0500 Received: by mail-wr1-x42f.google.com with SMTP id t5so3845324wrq.1 for ; Mon, 09 Jan 2023 06:03:26 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id e7-20020a5d5007000000b0023662d97130sm8556447wrt.20.2023.01.09.06.03.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:03:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qBqD1jL6rd3oQZEY1EzugDeM7Ut5P0fq+XRGKO9OmYs=; b=S7sWtxfEjMrTa/HSKGqceMpEyssxH/QC9HxergvdJPqqhBdZ9Eze9g7gAdnPNuF9Sf WEw6k3t5ThYVdO3P5B4/60ow6ldo0K7HfWJM7VwMn0BjSQ3U6jhP81mSWNA+4/rMVwih BXLkJrW0nFBT5h0NuNeuXBBdfWbCdx7wxO+O+HjVAg860274fCQrE9z4fhIUhFLemJLQ FnGTaA/PfuCkcW5SmLj/yiXyUwSmyo5JGDYmePapmu/aVuDqlve0w3Cu7GNjoOx0gvUX XAZKd/zbLfrE8JBv75+Cuyzu3IsdeR/NAWeVWVzhPsOSaKA8nCF+IsO2NdRF3oVLMVBH uyVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qBqD1jL6rd3oQZEY1EzugDeM7Ut5P0fq+XRGKO9OmYs=; b=eaW94KDKUsn5wWnpUhA/ojrl6gx0P2g1i+MvQXnvw8msMmBrQgu0VJnLTu6Ib4d9HL PUGYmQSitKCAxFYVmgOYSb4F54xldcd3uMyBnaft9vIBrHCj7U4vIqTSNkI/rXAct92w eIosDI+AlGEH3wbr+df+KA4MIp2/4F/gkVKCAtLCMFS9QpRPntSpW9zP1IQ+JMsRvUjZ wKKqRJEgyqi17j37q1CGXBLbVI2OjVILCqJmL5vjfi2rddgFu0iFeEQr/gbnYxDS6rGg uMACTuEcgTmxw33QOlnYTc/9Eoujcf6hgjui6fjwq+jdKqjNOH7MaJHGIDAzfjBD6ftb zCNw== X-Gm-Message-State: AFqh2kpYi7fUbAL6d3ssGwFO/cuVTyqlr6voXUeg0Hlf4l+/cfT6+QsF W/mGaeG+f506TJ6iW8VRHzzHd71Iay9fo+MA X-Google-Smtp-Source: AMrXdXuC/nNl8CbOGeWu65WICv24wiig+Eu0eGUCSgIQYSy6OZpY8mRnetjyaNgCZTHITMRw9bIc7w== X-Received: by 2002:adf:9dd0:0:b0:2af:8d8b:726e with SMTP id q16-20020adf9dd0000000b002af8d8b726emr10985410wre.1.1673273003750; Mon, 09 Jan 2023 06:03:23 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 03/14] hw/arm/omap: Drop useless casts from void * to pointer Date: Mon, 9 Jan 2023 15:02:55 +0100 Message-Id: <20230109140306.23161-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673275544222100003 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/omap1.c | 115 ++++++++++++++++++-------------------- hw/arm/omap2.c | 40 ++++++------- hw/arm/omap_sx1.c | 2 +- hw/arm/palm.c | 2 +- hw/char/omap_uart.c | 7 +-- hw/display/omap_dss.c | 15 +++-- hw/display/omap_lcdc.c | 9 ++- hw/dma/omap_dma.c | 15 +++-- hw/gpio/omap_gpio.c | 15 +++-- hw/intc/omap_intc.c | 12 ++-- hw/misc/omap_gpmc.c | 12 ++-- hw/misc/omap_l4.c | 7 +-- hw/misc/omap_sdrc.c | 7 +-- hw/misc/omap_tap.c | 5 +- hw/sd/omap_mmc.c | 9 ++- hw/ssi/omap_spi.c | 7 +-- hw/timer/omap_gptimer.c | 22 ++++---- hw/timer/omap_synctimer.c | 4 +- 18 files changed, 142 insertions(+), 163 deletions(-) diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index f693faa43e..559c066ce9 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -176,7 +176,7 @@ static void omap_timer_fire(void *opaque) =20 static void omap_timer_tick(void *opaque) { - struct omap_mpu_timer_s *timer =3D (struct omap_mpu_timer_s *) opaque; + struct omap_mpu_timer_s *timer =3D opaque; =20 omap_timer_sync(timer); omap_timer_fire(timer); @@ -185,7 +185,7 @@ static void omap_timer_tick(void *opaque) =20 static void omap_timer_clk_update(void *opaque, int line, int on) { - struct omap_mpu_timer_s *timer =3D (struct omap_mpu_timer_s *) opaque; + struct omap_mpu_timer_s *timer =3D opaque; =20 omap_timer_sync(timer); timer->rate =3D on ? omap_clk_getrate(timer->clk) : 0; @@ -202,7 +202,7 @@ static void omap_timer_clk_setup(struct omap_mpu_timer_= s *timer) static uint64_t omap_mpu_timer_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mpu_timer_s *s =3D (struct omap_mpu_timer_s *) opaque; + struct omap_mpu_timer_s *s =3D opaque; =20 if (size !=3D 4) { return omap_badwidth_read32(opaque, addr); @@ -226,7 +226,7 @@ static uint64_t omap_mpu_timer_read(void *opaque, hwadd= r addr, static void omap_mpu_timer_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_mpu_timer_s *s =3D (struct omap_mpu_timer_s *) opaque; + struct omap_mpu_timer_s *s =3D opaque; =20 if (size !=3D 4) { omap_badwidth_write32(opaque, addr, value); @@ -308,7 +308,7 @@ struct omap_watchdog_timer_s { static uint64_t omap_wd_timer_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_watchdog_timer_s *s =3D (struct omap_watchdog_timer_s *) o= paque; + struct omap_watchdog_timer_s *s =3D opaque; =20 if (size !=3D 2) { return omap_badwidth_read16(opaque, addr); @@ -333,7 +333,7 @@ static uint64_t omap_wd_timer_read(void *opaque, hwaddr= addr, static void omap_wd_timer_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_watchdog_timer_s *s =3D (struct omap_watchdog_timer_s *) o= paque; + struct omap_watchdog_timer_s *s =3D opaque; =20 if (size !=3D 2) { omap_badwidth_write16(opaque, addr, value); @@ -431,7 +431,7 @@ struct omap_32khz_timer_s { static uint64_t omap_os_timer_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_32khz_timer_s *s =3D (struct omap_32khz_timer_s *) opaque; + struct omap_32khz_timer_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (size !=3D 4) { @@ -458,7 +458,7 @@ static uint64_t omap_os_timer_read(void *opaque, hwaddr= addr, static void omap_os_timer_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_32khz_timer_s *s =3D (struct omap_32khz_timer_s *) opaque; + struct omap_32khz_timer_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (size !=3D 4) { @@ -532,7 +532,7 @@ static struct omap_32khz_timer_s *omap_os_timer_init(Me= moryRegion *memory, static uint64_t omap_ulpd_pm_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; uint16_t ret; =20 if (size !=3D 2) { @@ -600,7 +600,7 @@ static inline void omap_ulpd_req_update(struct omap_mpu= _state_s *s, static void omap_ulpd_pm_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; int64_t now, ticks; int div, mult; static const int bypass_div[4] =3D { 1, 2, 4, 4 }; @@ -765,7 +765,7 @@ static void omap_ulpd_pm_init(MemoryRegion *system_memo= ry, static uint64_t omap_pin_cfg_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; =20 if (size !=3D 4) { return omap_badwidth_read32(opaque, addr); @@ -876,7 +876,7 @@ static inline void omap_pin_modconf1_update(struct omap= _mpu_state_s *s, static void omap_pin_cfg_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; uint32_t diff; =20 if (size !=3D 4) { @@ -988,7 +988,7 @@ static void omap_pin_cfg_init(MemoryRegion *system_memo= ry, static uint64_t omap_id_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; =20 if (size !=3D 4) { return omap_badwidth_read32(opaque, addr); @@ -1070,7 +1070,7 @@ static void omap_id_init(MemoryRegion *memory, struct= omap_mpu_state_s *mpu) static uint64_t omap_mpui_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; =20 if (size !=3D 4) { return omap_badwidth_read32(opaque, addr); @@ -1103,7 +1103,7 @@ static uint64_t omap_mpui_read(void *opaque, hwaddr a= ddr, static void omap_mpui_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; =20 if (size !=3D 4) { omap_badwidth_write32(opaque, addr, value); @@ -1168,7 +1168,7 @@ struct omap_tipb_bridge_s { static uint64_t omap_tipb_bridge_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_tipb_bridge_s *s =3D (struct omap_tipb_bridge_s *) opaque; + struct omap_tipb_bridge_s *s =3D opaque; =20 if (size < 2) { return omap_badwidth_read16(opaque, addr); @@ -1198,7 +1198,7 @@ static uint64_t omap_tipb_bridge_read(void *opaque, h= waddr addr, static void omap_tipb_bridge_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_tipb_bridge_s *s =3D (struct omap_tipb_bridge_s *) opaque; + struct omap_tipb_bridge_s *s =3D opaque; =20 if (size < 2) { omap_badwidth_write16(opaque, addr, value); @@ -1269,7 +1269,7 @@ static struct omap_tipb_bridge_s *omap_tipb_bridge_in= it( static uint64_t omap_tcmi_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; uint32_t ret; =20 if (size !=3D 4) { @@ -1307,7 +1307,7 @@ static uint64_t omap_tcmi_read(void *opaque, hwaddr a= ddr, static void omap_tcmi_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; =20 if (size !=3D 4) { omap_badwidth_write32(opaque, addr, value); @@ -1384,7 +1384,7 @@ struct dpll_ctl_s { static uint64_t omap_dpll_read(void *opaque, hwaddr addr, unsigned size) { - struct dpll_ctl_s *s =3D (struct dpll_ctl_s *) opaque; + struct dpll_ctl_s *s =3D opaque; =20 if (size !=3D 2) { return omap_badwidth_read16(opaque, addr); @@ -1400,7 +1400,7 @@ static uint64_t omap_dpll_read(void *opaque, hwaddr a= ddr, static void omap_dpll_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct dpll_ctl_s *s =3D (struct dpll_ctl_s *) opaque; + struct dpll_ctl_s *s =3D opaque; uint16_t diff; static const int bypass_div[4] =3D { 1, 2, 4, 4 }; int div, mult; @@ -1464,7 +1464,7 @@ static struct dpll_ctl_s *omap_dpll_init(MemoryRegio= n *memory, static uint64_t omap_clkm_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; =20 if (size !=3D 2) { return omap_badwidth_read16(opaque, addr); @@ -1668,7 +1668,7 @@ static inline void omap_clkm_ckout1_update(struct oma= p_mpu_state_s *s, static void omap_clkm_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; uint16_t diff; omap_clk clk; static const char *clkschemename[8] =3D { @@ -1756,7 +1756,7 @@ static const MemoryRegionOps omap_clkm_ops =3D { static uint64_t omap_clkdsp_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; CPUState *cpu =3D CPU(s->cpu); =20 if (size !=3D 2) { @@ -1801,7 +1801,7 @@ static inline void omap_clkdsp_idlect2_update(struct = omap_mpu_state_s *s, static void omap_clkdsp_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; uint16_t diff; =20 if (size !=3D 2) { @@ -1911,7 +1911,7 @@ struct omap_mpuio_s { =20 static void omap_mpuio_set(void *opaque, int line, int level) { - struct omap_mpuio_s *s =3D (struct omap_mpuio_s *) opaque; + struct omap_mpuio_s *s =3D opaque; uint16_t prev =3D s->inputs; =20 if (level) @@ -1947,7 +1947,7 @@ static void omap_mpuio_kbd_update(struct omap_mpuio_s= *s) static uint64_t omap_mpuio_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mpuio_s *s =3D (struct omap_mpuio_s *) opaque; + struct omap_mpuio_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; uint16_t ret; =20 @@ -2007,7 +2007,7 @@ static uint64_t omap_mpuio_read(void *opaque, hwaddr = addr, static void omap_mpuio_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_mpuio_s *s =3D (struct omap_mpuio_s *) opaque; + struct omap_mpuio_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; uint16_t diff; int ln; @@ -2104,7 +2104,7 @@ static void omap_mpuio_reset(struct omap_mpuio_s *s) =20 static void omap_mpuio_onoff(void *opaque, int line, int on) { - struct omap_mpuio_s *s =3D (struct omap_mpuio_s *) opaque; + struct omap_mpuio_s *s =3D opaque; =20 s->clk =3D on; if (on) @@ -2198,10 +2198,9 @@ static void omap_uwire_transfer_start(struct omap_uw= ire_s *s) } } =20 -static uint64_t omap_uwire_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_uwire_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_uwire_s *s =3D (struct omap_uwire_s *) opaque; + struct omap_uwire_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (size !=3D 2) { @@ -2235,7 +2234,7 @@ static uint64_t omap_uwire_read(void *opaque, hwaddr = addr, static void omap_uwire_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_uwire_s *s =3D (struct omap_uwire_s *) opaque; + struct omap_uwire_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (size !=3D 2) { @@ -2351,10 +2350,9 @@ static void omap_pwl_update(struct omap_pwl_s *s) } } =20 -static uint64_t omap_pwl_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_pwl_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_pwl_s *s =3D (struct omap_pwl_s *) opaque; + struct omap_pwl_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (size !=3D 1) { @@ -2374,7 +2372,7 @@ static uint64_t omap_pwl_read(void *opaque, hwaddr ad= dr, static void omap_pwl_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_pwl_s *s =3D (struct omap_pwl_s *) opaque; + struct omap_pwl_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (size !=3D 1) { @@ -2414,7 +2412,7 @@ static void omap_pwl_reset(struct omap_pwl_s *s) =20 static void omap_pwl_clk_update(void *opaque, int line, int on) { - struct omap_pwl_s *s =3D (struct omap_pwl_s *) opaque; + struct omap_pwl_s *s =3D opaque; =20 s->clk =3D on; omap_pwl_update(s); @@ -2445,10 +2443,9 @@ struct omap_pwt_s { omap_clk clk; }; =20 -static uint64_t omap_pwt_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_pwt_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_pwt_s *s =3D (struct omap_pwt_s *) opaque; + struct omap_pwt_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (size !=3D 1) { @@ -2470,7 +2467,7 @@ static uint64_t omap_pwt_read(void *opaque, hwaddr ad= dr, static void omap_pwt_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_pwt_s *s =3D (struct omap_pwt_s *) opaque; + struct omap_pwt_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (size !=3D 1) { @@ -2577,10 +2574,9 @@ static void omap_rtc_alarm_update(struct omap_rtc_s = *s) printf("%s: conversion failed\n", __func__); } =20 -static uint64_t omap_rtc_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_rtc_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_rtc_s *s =3D (struct omap_rtc_s *) opaque; + struct omap_rtc_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; uint8_t i; =20 @@ -2662,7 +2658,7 @@ static uint64_t omap_rtc_read(void *opaque, hwaddr ad= dr, static void omap_rtc_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_rtc_s *s =3D (struct omap_rtc_s *) opaque; + struct omap_rtc_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; struct tm new_tm; time_t ti[2]; @@ -3034,7 +3030,7 @@ static void omap_mcbsp_rx_newdata(struct omap_mcbsp_s= *s) =20 static void omap_mcbsp_source_tick(void *opaque) { - struct omap_mcbsp_s *s =3D (struct omap_mcbsp_s *) opaque; + struct omap_mcbsp_s *s =3D opaque; static const int bps[8] =3D { 0, 1, 1, 2, 2, 2, -255, -255 }; =20 if (!s->rx_rate) @@ -3080,7 +3076,7 @@ static void omap_mcbsp_tx_newdata(struct omap_mcbsp_s= *s) =20 static void omap_mcbsp_sink_tick(void *opaque) { - struct omap_mcbsp_s *s =3D (struct omap_mcbsp_s *) opaque; + struct omap_mcbsp_s *s =3D opaque; static const int bps[8] =3D { 0, 1, 1, 2, 2, 2, -255, -255 }; =20 if (!s->tx_rate) @@ -3173,7 +3169,7 @@ static void omap_mcbsp_req_update(struct omap_mcbsp_s= *s) static uint64_t omap_mcbsp_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mcbsp_s *s =3D (struct omap_mcbsp_s *) opaque; + struct omap_mcbsp_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; uint16_t ret; =20 @@ -3271,7 +3267,7 @@ static uint64_t omap_mcbsp_read(void *opaque, hwaddr = addr, static void omap_mcbsp_writeh(void *opaque, hwaddr addr, uint32_t value) { - struct omap_mcbsp_s *s =3D (struct omap_mcbsp_s *) opaque; + struct omap_mcbsp_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 switch (offset) { @@ -3407,7 +3403,7 @@ static void omap_mcbsp_writeh(void *opaque, hwaddr ad= dr, static void omap_mcbsp_writew(void *opaque, hwaddr addr, uint32_t value) { - struct omap_mcbsp_s *s =3D (struct omap_mcbsp_s *) opaque; + struct omap_mcbsp_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (offset =3D=3D 0x04) { /* DXR */ @@ -3498,7 +3494,7 @@ static struct omap_mcbsp_s *omap_mcbsp_init(MemoryReg= ion *system_memory, =20 static void omap_mcbsp_i2s_swallow(void *opaque, int line, int level) { - struct omap_mcbsp_s *s =3D (struct omap_mcbsp_s *) opaque; + struct omap_mcbsp_s *s =3D opaque; =20 if (s->rx_rate) { s->rx_req =3D s->codec->in.len; @@ -3508,7 +3504,7 @@ static void omap_mcbsp_i2s_swallow(void *opaque, int = line, int level) =20 static void omap_mcbsp_i2s_start(void *opaque, int line, int level) { - struct omap_mcbsp_s *s =3D (struct omap_mcbsp_s *) opaque; + struct omap_mcbsp_s *s =3D opaque; =20 if (s->tx_rate) { s->tx_req =3D s->codec->out.size; @@ -3590,10 +3586,9 @@ static void omap_lpg_reset(struct omap_lpg_s *s) omap_lpg_update(s); } =20 -static uint64_t omap_lpg_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_lpg_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_lpg_s *s =3D (struct omap_lpg_s *) opaque; + struct omap_lpg_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (size !=3D 1) { @@ -3615,7 +3610,7 @@ static uint64_t omap_lpg_read(void *opaque, hwaddr ad= dr, static void omap_lpg_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_lpg_s *s =3D (struct omap_lpg_s *) opaque; + struct omap_lpg_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (size !=3D 1) { @@ -3650,7 +3645,7 @@ static const MemoryRegionOps omap_lpg_ops =3D { =20 static void omap_lpg_clk_update(void *opaque, int line, int on) { - struct omap_lpg_s *s =3D (struct omap_lpg_s *) opaque; + struct omap_lpg_s *s =3D opaque; =20 s->clk =3D on; omap_lpg_update(s); @@ -3713,7 +3708,7 @@ static void omap_setup_mpui_io(MemoryRegion *system_m= emory, /* General chip reset */ static void omap1_mpu_reset(void *opaque) { - struct omap_mpu_state_s *mpu =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *mpu =3D opaque; =20 omap_dma_reset(mpu->dma); omap_mpu_timer_reset(mpu->timer[0]); @@ -3793,7 +3788,7 @@ static void omap_setup_dsp_mapping(MemoryRegion *syst= em_memory, =20 void omap_mpu_wakeup(void *opaque, int irq, int req) { - struct omap_mpu_state_s *mpu =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *mpu =3D opaque; CPUState *cpu =3D CPU(mpu->cpu); =20 if (cpu->halted) { diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 8571eedd73..366d6af1b6 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -167,7 +167,7 @@ static inline void omap_eac_out_empty(struct omap_eac_s= *s) =20 static void omap_eac_in_cb(void *opaque, int avail_b) { - struct omap_eac_s *s =3D (struct omap_eac_s *) opaque; + struct omap_eac_s *s =3D opaque; =20 s->codec.rxavail =3D avail_b >> 2; omap_eac_in_refill(s); @@ -177,7 +177,7 @@ static void omap_eac_in_cb(void *opaque, int avail_b) =20 static void omap_eac_out_cb(void *opaque, int free_b) { - struct omap_eac_s *s =3D (struct omap_eac_s *) opaque; + struct omap_eac_s *s =3D opaque; =20 s->codec.txavail =3D free_b >> 2; if (s->codec.txlen) @@ -333,10 +333,9 @@ static void omap_eac_reset(struct omap_eac_s *s) omap_eac_interrupt_update(s); } =20 -static uint64_t omap_eac_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_eac_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_eac_s *s =3D (struct omap_eac_s *) opaque; + struct omap_eac_s *s =3D opaque; uint32_t ret; =20 if (size !=3D 2) { @@ -452,7 +451,7 @@ static uint64_t omap_eac_read(void *opaque, hwaddr addr, static void omap_eac_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_eac_s *s =3D (struct omap_eac_s *) opaque; + struct omap_eac_s *s =3D opaque; =20 if (size !=3D 2) { omap_badwidth_write16(opaque, addr, value); @@ -656,7 +655,7 @@ static void omap_sti_reset(struct omap_sti_s *s) static uint64_t omap_sti_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_sti_s *s =3D (struct omap_sti_s *) opaque; + struct omap_sti_s *s =3D opaque; =20 if (size !=3D 4) { return omap_badwidth_read32(opaque, addr); @@ -697,7 +696,7 @@ static uint64_t omap_sti_read(void *opaque, hwaddr addr, static void omap_sti_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_sti_s *s =3D (struct omap_sti_s *) opaque; + struct omap_sti_s *s =3D opaque; =20 if (size !=3D 4) { omap_badwidth_write32(opaque, addr, value); @@ -751,8 +750,7 @@ static const MemoryRegionOps omap_sti_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static uint64_t omap_sti_fifo_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_sti_fifo_read(void *opaque, hwaddr addr, unsigned siz= e) { OMAP_BAD_REG(addr); return 0; @@ -761,7 +759,7 @@ static uint64_t omap_sti_fifo_read(void *opaque, hwaddr= addr, static void omap_sti_fifo_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_sti_s *s =3D (struct omap_sti_s *) opaque; + struct omap_sti_s *s =3D opaque; int ch =3D addr >> 6; uint8_t byte =3D value; =20 @@ -1057,7 +1055,7 @@ static void omap_prcm_int_update(struct omap_prcm_s *= s, int dom) static uint64_t omap_prcm_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_prcm_s *s =3D (struct omap_prcm_s *) opaque; + struct omap_prcm_s *s =3D opaque; uint32_t ret; =20 if (size !=3D 4) { @@ -1369,7 +1367,7 @@ static void omap_prcm_dpll_update(struct omap_prcm_s = *s) static void omap_prcm_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_prcm_s *s =3D (struct omap_prcm_s *) opaque; + struct omap_prcm_s *s =3D opaque; =20 if (size !=3D 4) { omap_badwidth_write32(opaque, addr, value); @@ -1849,7 +1847,7 @@ struct omap_sysctl_s { static uint32_t omap_sysctl_read8(void *opaque, hwaddr addr) { =20 - struct omap_sysctl_s *s =3D (struct omap_sysctl_s *) opaque; + struct omap_sysctl_s *s =3D opaque; int pad_offset, byte_offset; int value; =20 @@ -1873,7 +1871,7 @@ static uint32_t omap_sysctl_read8(void *opaque, hwadd= r addr) =20 static uint32_t omap_sysctl_read(void *opaque, hwaddr addr) { - struct omap_sysctl_s *s =3D (struct omap_sysctl_s *) opaque; + struct omap_sysctl_s *s =3D opaque; =20 switch (addr) { case 0x000: /* CONTROL_REVISION */ @@ -1971,10 +1969,9 @@ static uint32_t omap_sysctl_read(void *opaque, hwadd= r addr) return 0; } =20 -static void omap_sysctl_write8(void *opaque, hwaddr addr, - uint32_t value) +static void omap_sysctl_write8(void *opaque, hwaddr addr, uint32_t value) { - struct omap_sysctl_s *s =3D (struct omap_sysctl_s *) opaque; + struct omap_sysctl_s *s =3D opaque; int pad_offset, byte_offset; int prev_value; =20 @@ -1995,10 +1992,9 @@ static void omap_sysctl_write8(void *opaque, hwaddr = addr, } } =20 -static void omap_sysctl_write(void *opaque, hwaddr addr, - uint32_t value) +static void omap_sysctl_write(void *opaque, hwaddr addr, uint32_t value) { - struct omap_sysctl_s *s =3D (struct omap_sysctl_s *) opaque; + struct omap_sysctl_s *s =3D opaque; =20 switch (addr) { case 0x000: /* CONTROL_REVISION */ @@ -2233,7 +2229,7 @@ static struct omap_sysctl_s *omap_sysctl_init(struct = omap_target_agent_s *ta, /* General chip reset */ static void omap2_mpu_reset(void *opaque) { - struct omap_mpu_state_s *mpu =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *mpu =3D opaque; =20 omap_dma_reset(mpu->dma); omap_prcm_reset(mpu->prcm); diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index 57829b3744..744c09b492 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -65,7 +65,7 @@ static uint64_t static_read(void *opaque, hwaddr offset, unsigned size) { - uint32_t *val =3D (uint32_t *) opaque; + uint32_t *val =3D opaque; uint32_t mask =3D (4 / size) - 1; =20 return *val >> ((offset & mask) << 3); diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 68e11dd1ec..1457f10c83 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -115,7 +115,7 @@ static struct { =20 static void palmte_button_event(void *opaque, int keycode) { - struct omap_mpu_state_s *cpu =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *cpu =3D opaque; =20 if (palmte_keymap[keycode & 0x7f].row !=3D -1) omap_mpuio_key(cpu->mpuio, diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c index e8da933378..1c890b9201 100644 --- a/hw/char/omap_uart.c +++ b/hw/char/omap_uart.c @@ -67,10 +67,9 @@ struct omap_uart_s *omap_uart_init(hwaddr base, return s; } =20 -static uint64_t omap_uart_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_uart_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_uart_s *s =3D (struct omap_uart_s *) opaque; + struct omap_uart_s *s =3D opaque; =20 if (size =3D=3D 4) { return omap_badwidth_read8(opaque, addr); @@ -108,7 +107,7 @@ static uint64_t omap_uart_read(void *opaque, hwaddr add= r, static void omap_uart_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_uart_s *s =3D (struct omap_uart_s *) opaque; + struct omap_uart_s *s =3D opaque; =20 if (size =3D=3D 4) { omap_badwidth_write8(opaque, addr, value); diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c index 09e18407b4..f33fc7606d 100644 --- a/hw/display/omap_dss.c +++ b/hw/display/omap_dss.c @@ -175,7 +175,7 @@ void omap_dss_reset(struct omap_dss_s *s) static uint64_t omap_diss_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_dss_s *s =3D (struct omap_dss_s *) opaque; + struct omap_dss_s *s =3D opaque; =20 if (size !=3D 4) { return omap_badwidth_read32(opaque, addr); @@ -213,7 +213,7 @@ static uint64_t omap_diss_read(void *opaque, hwaddr add= r, static void omap_diss_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_dss_s *s =3D (struct omap_dss_s *) opaque; + struct omap_dss_s *s =3D opaque; =20 if (size !=3D 4) { omap_badwidth_write32(opaque, addr, value); @@ -254,7 +254,7 @@ static const MemoryRegionOps omap_diss_ops =3D { static uint64_t omap_disc_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_dss_s *s =3D (struct omap_dss_s *) opaque; + struct omap_dss_s *s =3D opaque; =20 if (size !=3D 4) { return omap_badwidth_read32(opaque, addr); @@ -379,7 +379,7 @@ static uint64_t omap_disc_read(void *opaque, hwaddr add= r, static void omap_disc_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_dss_s *s =3D (struct omap_dss_s *) opaque; + struct omap_dss_s *s =3D opaque; =20 if (size !=3D 4) { omap_badwidth_write32(opaque, addr, value); @@ -669,10 +669,9 @@ static void omap_rfbi_transfer_start(struct omap_dss_s= *s) omap_dispc_interrupt_update(s); } =20 -static uint64_t omap_rfbi_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_rfbi_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_dss_s *s =3D (struct omap_dss_s *) opaque; + struct omap_dss_s *s =3D opaque; =20 if (size !=3D 4) { return omap_badwidth_read32(opaque, addr); @@ -739,7 +738,7 @@ static uint64_t omap_rfbi_read(void *opaque, hwaddr add= r, static void omap_rfbi_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_dss_s *s =3D (struct omap_dss_s *) opaque; + struct omap_dss_s *s =3D opaque; =20 if (size !=3D 4) { omap_badwidth_write32(opaque, addr, value); diff --git a/hw/display/omap_lcdc.c b/hw/display/omap_lcdc.c index 0ba42ef637..3532a801be 100644 --- a/hw/display/omap_lcdc.c +++ b/hw/display/omap_lcdc.c @@ -198,7 +198,7 @@ static void draw_line16_32(void *opaque, uint8_t *d, co= nst uint8_t *s, =20 static void omap_update_display(void *opaque) { - struct omap_lcd_panel_s *omap_lcd =3D (struct omap_lcd_panel_s *) opaq= ue; + struct omap_lcd_panel_s *omap_lcd =3D opaque; DisplaySurface *surface; drawfn draw_line; int size, height, first, last; @@ -376,10 +376,9 @@ static void omap_lcd_update(struct omap_lcd_panel_s *s= ) { } } =20 -static uint64_t omap_lcdc_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_lcdc_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_lcd_panel_s *s =3D (struct omap_lcd_panel_s *) opaque; + struct omap_lcd_panel_s *s =3D opaque; =20 switch (addr) { case 0x00: /* LCD_CONTROL */ @@ -412,7 +411,7 @@ static uint64_t omap_lcdc_read(void *opaque, hwaddr add= r, static void omap_lcdc_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_lcd_panel_s *s =3D (struct omap_lcd_panel_s *) opaque; + struct omap_lcd_panel_s *s =3D opaque; =20 switch (addr) { case 0x00: /* LCD_CONTROL */ diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index 6677237d42..c6e35ba4b8 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -1454,10 +1454,9 @@ static int omap_dma_sys_read(struct omap_dma_s *s, i= nt offset, return 0; } =20 -static uint64_t omap_dma_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_dma_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_dma_s *s =3D (struct omap_dma_s *) opaque; + struct omap_dma_s *s =3D opaque; int reg, ch; uint16_t ret; =20 @@ -1505,7 +1504,7 @@ static uint64_t omap_dma_read(void *opaque, hwaddr ad= dr, static void omap_dma_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_dma_s *s =3D (struct omap_dma_s *) opaque; + struct omap_dma_s *s =3D opaque; int reg, ch; =20 if (size !=3D 2) { @@ -1557,7 +1556,7 @@ static const MemoryRegionOps omap_dma_ops =3D { =20 static void omap_dma_request(void *opaque, int drq, int req) { - struct omap_dma_s *s =3D (struct omap_dma_s *) opaque; + struct omap_dma_s *s =3D opaque; /* The request pins are level triggered in QEMU. */ if (req) { if (~s->dma->drqbmp & (1ULL << drq)) { @@ -1571,7 +1570,7 @@ static void omap_dma_request(void *opaque, int drq, i= nt req) /* XXX: this won't be needed once soc_dma knows about clocks. */ static void omap_dma_clk_update(void *opaque, int line, int on) { - struct omap_dma_s *s =3D (struct omap_dma_s *) opaque; + struct omap_dma_s *s =3D opaque; int i; =20 s->dma->freq =3D omap_clk_getrate(s->clk); @@ -1703,7 +1702,7 @@ static void omap_dma_interrupts_4_update(struct omap_= dma_s *s) static uint64_t omap_dma4_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_dma_s *s =3D (struct omap_dma_s *) opaque; + struct omap_dma_s *s =3D opaque; int irqn =3D 0, chnum; struct omap_dma_channel_s *ch; =20 @@ -1859,7 +1858,7 @@ static uint64_t omap_dma4_read(void *opaque, hwaddr a= ddr, static void omap_dma4_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_dma_s *s =3D (struct omap_dma_s *) opaque; + struct omap_dma_s *s =3D opaque; int chnum, irqn =3D 0; struct omap_dma_channel_s *ch; =20 diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 12ec16d1b0..b3cb3499bd 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -72,7 +72,7 @@ static void omap_gpio_set(void *opaque, int line, int lev= el) static uint64_t omap_gpio_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_gpio_s *s =3D (struct omap_gpio_s *) opaque; + struct omap_gpio_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; =20 if (size !=3D 2) { @@ -110,7 +110,7 @@ static uint64_t omap_gpio_read(void *opaque, hwaddr add= r, static void omap_gpio_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_gpio_s *s =3D (struct omap_gpio_s *) opaque; + struct omap_gpio_s *s =3D opaque; int offset =3D addr & OMAP_MPUI_REG_MASK; uint16_t diff; int ln; @@ -309,7 +309,7 @@ static void omap2_gpio_module_reset(struct omap2_gpio_s= *s) =20 static uint32_t omap2_gpio_module_read(void *opaque, hwaddr addr) { - struct omap2_gpio_s *s =3D (struct omap2_gpio_s *) opaque; + struct omap2_gpio_s *s =3D opaque; =20 switch (addr) { case 0x00: /* GPIO_REVISION */ @@ -382,7 +382,7 @@ static uint32_t omap2_gpio_module_read(void *opaque, hw= addr addr) static void omap2_gpio_module_write(void *opaque, hwaddr addr, uint32_t value) { - struct omap2_gpio_s *s =3D (struct omap2_gpio_s *) opaque; + struct omap2_gpio_s *s =3D opaque; uint32_t diff; int ln; =20 @@ -611,10 +611,9 @@ static void omap2_gpif_reset(DeviceState *dev) s->gpo =3D 0; } =20 -static uint64_t omap2_gpif_top_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap2_gpif_top_read(void *opaque, hwaddr addr, unsigned si= ze) { - struct omap2_gpif_s *s =3D (struct omap2_gpif_s *) opaque; + struct omap2_gpif_s *s =3D opaque; =20 switch (addr) { case 0x00: /* IPGENERICOCPSPL_REVISION */ @@ -643,7 +642,7 @@ static uint64_t omap2_gpif_top_read(void *opaque, hwadd= r addr, static void omap2_gpif_top_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap2_gpif_s *s =3D (struct omap2_gpif_s *) opaque; + struct omap2_gpif_s *s =3D opaque; =20 switch (addr) { case 0x00: /* IPGENERICOCPSPL_REVISION */ diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index d7183d035e..9f6a71ce30 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -109,7 +109,7 @@ static inline void omap_inth_update(struct omap_intr_ha= ndler_s *s, int is_fiq) =20 static void omap_set_intr(void *opaque, int irq, int req) { - struct omap_intr_handler_s *ih =3D (struct omap_intr_handler_s *) opaq= ue; + struct omap_intr_handler_s *ih =3D opaque; uint32_t rise; =20 struct omap_intr_handler_bank_s *bank =3D &ih->bank[irq >> 5]; @@ -136,7 +136,7 @@ static void omap_set_intr(void *opaque, int irq, int re= q) /* Simplified version with no edge detection */ static void omap_set_intr_noedge(void *opaque, int irq, int req) { - struct omap_intr_handler_s *ih =3D (struct omap_intr_handler_s *) opaq= ue; + struct omap_intr_handler_s *ih =3D opaque; uint32_t rise; =20 struct omap_intr_handler_bank_s *bank =3D &ih->bank[irq >> 5]; @@ -156,7 +156,7 @@ static void omap_set_intr_noedge(void *opaque, int irq,= int req) static uint64_t omap_inth_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_intr_handler_s *s =3D (struct omap_intr_handler_s *) opaqu= e; + struct omap_intr_handler_s *s =3D opaque; int i, offset =3D addr; int bank_no =3D offset >> 8; int line_no; @@ -234,7 +234,7 @@ static uint64_t omap_inth_read(void *opaque, hwaddr add= r, static void omap_inth_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_intr_handler_s *s =3D (struct omap_intr_handler_s *) opaqu= e; + struct omap_intr_handler_s *s =3D opaque; int i, offset =3D addr; int bank_no =3D offset >> 8; struct omap_intr_handler_bank_s *bank =3D &s->bank[bank_no]; @@ -423,7 +423,7 @@ static const TypeInfo omap_intc_info =3D { static uint64_t omap2_inth_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_intr_handler_s *s =3D (struct omap_intr_handler_s *) opaqu= e; + struct omap_intr_handler_s *s =3D opaque; int offset =3D addr; int bank_no, line_no; struct omap_intr_handler_bank_s *bank =3D NULL; @@ -504,7 +504,7 @@ static uint64_t omap2_inth_read(void *opaque, hwaddr ad= dr, static void omap2_inth_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_intr_handler_s *s =3D (struct omap_intr_handler_s *) opaqu= e; + struct omap_intr_handler_s *s =3D opaque; int offset =3D addr; int bank_no, line_no; struct omap_intr_handler_bank_s *bank =3D NULL; diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c index 10de7a5523..67158eb164 100644 --- a/hw/misc/omap_gpmc.c +++ b/hw/misc/omap_gpmc.c @@ -126,7 +126,7 @@ static void omap_gpmc_dma_update(struct omap_gpmc_s *s,= int value) static uint64_t omap_nand_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_gpmc_cs_file_s *f =3D (struct omap_gpmc_cs_file_s *)opaque; + struct omap_gpmc_cs_file_s *f =3D opaque; uint64_t v; nand_setpins(f->dev, 0, 0, 0, 1, 0); switch (omap_gpmc_devsize(f)) { @@ -205,7 +205,7 @@ static void omap_nand_setio(DeviceState *dev, uint64_t = value, static void omap_nand_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_gpmc_cs_file_s *f =3D (struct omap_gpmc_cs_file_s *)opaque; + struct omap_gpmc_cs_file_s *f =3D opaque; nand_setpins(f->dev, 0, 0, 0, 1, 0); omap_nand_setio(f->dev, value, omap_gpmc_devsize(f), size); } @@ -290,7 +290,7 @@ static void fill_prefetch_fifo(struct omap_gpmc_s *s) static uint64_t omap_gpmc_prefetch_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_gpmc_s *s =3D (struct omap_gpmc_s *) opaque; + struct omap_gpmc_s *s =3D opaque; uint32_t data; if (s->prefetch.config1 & 1) { /* The TRM doesn't define the behaviour if you read from the @@ -320,7 +320,7 @@ static uint64_t omap_gpmc_prefetch_read(void *opaque, h= waddr addr, static void omap_gpmc_prefetch_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_gpmc_s *s =3D (struct omap_gpmc_s *) opaque; + struct omap_gpmc_s *s =3D opaque; int cs =3D prefetch_cs(s->prefetch.config1); if ((s->prefetch.config1 & 1) =3D=3D 0) { /* The TRM doesn't define the behaviour of writing to the @@ -509,7 +509,7 @@ static int gpmc_wordaccess_only(hwaddr addr) static uint64_t omap_gpmc_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_gpmc_s *s =3D (struct omap_gpmc_s *) opaque; + struct omap_gpmc_s *s =3D opaque; int cs; struct omap_gpmc_cs_file_s *f; =20 @@ -621,7 +621,7 @@ static uint64_t omap_gpmc_read(void *opaque, hwaddr add= r, static void omap_gpmc_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_gpmc_s *s =3D (struct omap_gpmc_s *) opaque; + struct omap_gpmc_s *s =3D opaque; int cs; struct omap_gpmc_cs_file_s *f; =20 diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c index 54aeaecd69..b7875489da 100644 --- a/hw/misc/omap_l4.c +++ b/hw/misc/omap_l4.c @@ -52,10 +52,9 @@ hwaddr omap_l4_region_size(struct omap_target_agent_s *t= a, return ta->start[region].size; } =20 -static uint64_t omap_l4ta_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_l4ta_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_target_agent_s *s =3D (struct omap_target_agent_s *) opaqu= e; + struct omap_target_agent_s *s =3D opaque; =20 if (size !=3D 2) { return omap_badwidth_read16(opaque, addr); @@ -79,7 +78,7 @@ static uint64_t omap_l4ta_read(void *opaque, hwaddr addr, static void omap_l4ta_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_target_agent_s *s =3D (struct omap_target_agent_s *) opaqu= e; + struct omap_target_agent_s *s =3D opaque; =20 if (size !=3D 4) { omap_badwidth_write32(opaque, addr, value); diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c index f2f72f6810..6aa1b3ef7f 100644 --- a/hw/misc/omap_sdrc.c +++ b/hw/misc/omap_sdrc.c @@ -31,10 +31,9 @@ void omap_sdrc_reset(struct omap_sdrc_s *s) s->config =3D 0x10; } =20 -static uint64_t omap_sdrc_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_sdrc_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_sdrc_s *s =3D (struct omap_sdrc_s *) opaque; + struct omap_sdrc_s *s =3D opaque; =20 if (size !=3D 4) { return omap_badwidth_read32(opaque, addr); @@ -89,7 +88,7 @@ static uint64_t omap_sdrc_read(void *opaque, hwaddr addr, static void omap_sdrc_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_sdrc_s *s =3D (struct omap_sdrc_s *) opaque; + struct omap_sdrc_s *s =3D opaque; =20 if (size !=3D 4) { omap_badwidth_write32(opaque, addr, value); diff --git a/hw/misc/omap_tap.c b/hw/misc/omap_tap.c index 3f595e8df7..4d7fb7d85f 100644 --- a/hw/misc/omap_tap.c +++ b/hw/misc/omap_tap.c @@ -23,10 +23,9 @@ #include "hw/arm/omap.h" =20 /* TEST-Chip-level TAP */ -static uint64_t omap_tap_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_tap_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mpu_state_s *s =3D (struct omap_mpu_state_s *) opaque; + struct omap_mpu_state_s *s =3D opaque; =20 if (size !=3D 4) { return omap_badwidth_read32(opaque, addr); diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index b67def6381..edd3cf2a1e 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -321,11 +321,10 @@ void omap_mmc_reset(struct omap_mmc_s *host) device_cold_reset(DEVICE(host->card)); } =20 -static uint64_t omap_mmc_read(void *opaque, hwaddr offset, - unsigned size) +static uint64_t omap_mmc_read(void *opaque, hwaddr offset, unsigned size) { uint16_t i; - struct omap_mmc_s *s =3D (struct omap_mmc_s *) opaque; + struct omap_mmc_s *s =3D opaque; =20 if (size !=3D 2) { return omap_badwidth_read16(opaque, offset); @@ -418,7 +417,7 @@ static void omap_mmc_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { int i; - struct omap_mmc_s *s =3D (struct omap_mmc_s *) opaque; + struct omap_mmc_s *s =3D opaque; =20 if (size !=3D 2) { omap_badwidth_write16(opaque, offset, value); @@ -576,7 +575,7 @@ static const MemoryRegionOps omap_mmc_ops =3D { =20 static void omap_mmc_cover_cb(void *opaque, int line, int level) { - struct omap_mmc_s *host =3D (struct omap_mmc_s *) opaque; + struct omap_mmc_s *host =3D opaque; =20 if (!host->cdet_state && level) { host->status |=3D 0x0002; diff --git a/hw/ssi/omap_spi.c b/hw/ssi/omap_spi.c index 7c7e689707..8f85c3e391 100644 --- a/hw/ssi/omap_spi.c +++ b/hw/ssi/omap_spi.c @@ -134,10 +134,9 @@ void omap_mcspi_reset(struct omap_mcspi_s *s) omap_mcspi_interrupt_update(s); } =20 -static uint64_t omap_mcspi_read(void *opaque, hwaddr addr, - unsigned size) +static uint64_t omap_mcspi_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_mcspi_s *s =3D (struct omap_mcspi_s *) opaque; + struct omap_mcspi_s *s =3D opaque; int ch =3D 0; uint32_t ret; =20 @@ -226,7 +225,7 @@ static uint64_t omap_mcspi_read(void *opaque, hwaddr ad= dr, static void omap_mcspi_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_mcspi_s *s =3D (struct omap_mcspi_s *) opaque; + struct omap_mcspi_s *s =3D opaque; int ch =3D 0; =20 if (size !=3D 4) { diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c index c407190138..34e6af7aff 100644 --- a/hw/timer/omap_gptimer.c +++ b/hw/timer/omap_gptimer.c @@ -159,7 +159,7 @@ static inline void omap_gp_timer_trigger(struct omap_gp= _timer_s *timer) =20 static void omap_gp_timer_tick(void *opaque) { - struct omap_gp_timer_s *timer =3D (struct omap_gp_timer_s *) opaque; + struct omap_gp_timer_s *timer =3D opaque; =20 if (!timer->ar) { timer->st =3D 0; @@ -179,7 +179,7 @@ static void omap_gp_timer_tick(void *opaque) =20 static void omap_gp_timer_match(void *opaque) { - struct omap_gp_timer_s *timer =3D (struct omap_gp_timer_s *) opaque; + struct omap_gp_timer_s *timer =3D opaque; =20 if (timer->trigger =3D=3D gpt_trigger_both) omap_gp_timer_trigger(timer); @@ -189,7 +189,7 @@ static void omap_gp_timer_match(void *opaque) =20 static void omap_gp_timer_input(void *opaque, int line, int on) { - struct omap_gp_timer_s *s =3D (struct omap_gp_timer_s *) opaque; + struct omap_gp_timer_s *s =3D opaque; int trigger; =20 switch (s->capture) { @@ -219,7 +219,7 @@ static void omap_gp_timer_input(void *opaque, int line,= int on) =20 static void omap_gp_timer_clk_update(void *opaque, int line, int on) { - struct omap_gp_timer_s *timer =3D (struct omap_gp_timer_s *) opaque; + struct omap_gp_timer_s *timer =3D opaque; =20 omap_gp_timer_sync(timer); timer->rate =3D on ? omap_clk_getrate(timer->clk) : 0; @@ -262,7 +262,7 @@ void omap_gp_timer_reset(struct omap_gp_timer_s *s) =20 static uint32_t omap_gp_timer_readw(void *opaque, hwaddr addr) { - struct omap_gp_timer_s *s =3D (struct omap_gp_timer_s *) opaque; + struct omap_gp_timer_s *s =3D opaque; =20 switch (addr) { case 0x00: /* TIDR */ @@ -328,7 +328,7 @@ static uint32_t omap_gp_timer_readw(void *opaque, hwadd= r addr) =20 static uint32_t omap_gp_timer_readh(void *opaque, hwaddr addr) { - struct omap_gp_timer_s *s =3D (struct omap_gp_timer_s *) opaque; + struct omap_gp_timer_s *s =3D opaque; uint32_t ret; =20 if (addr & 2) @@ -340,10 +340,9 @@ static uint32_t omap_gp_timer_readh(void *opaque, hwad= dr addr) } } =20 -static void omap_gp_timer_write(void *opaque, hwaddr addr, - uint32_t value) +static void omap_gp_timer_write(void *opaque, hwaddr addr, uint32_t value) { - struct omap_gp_timer_s *s =3D (struct omap_gp_timer_s *) opaque; + struct omap_gp_timer_s *s =3D opaque; =20 switch (addr) { case 0x00: /* TIDR */ @@ -440,10 +439,9 @@ static void omap_gp_timer_write(void *opaque, hwaddr a= ddr, } } =20 -static void omap_gp_timer_writeh(void *opaque, hwaddr addr, - uint32_t value) +static void omap_gp_timer_writeh(void *opaque, hwaddr addr, uint32_t value) { - struct omap_gp_timer_s *s =3D (struct omap_gp_timer_s *) opaque; + struct omap_gp_timer_s *s =3D opaque; =20 if (addr & 2) omap_gp_timer_write(opaque, addr, (value << 16) | s->writeh); diff --git a/hw/timer/omap_synctimer.c b/hw/timer/omap_synctimer.c index 72b997939b..d93a9344ed 100644 --- a/hw/timer/omap_synctimer.c +++ b/hw/timer/omap_synctimer.c @@ -39,7 +39,7 @@ void omap_synctimer_reset(struct omap_synctimer_s *s) =20 static uint32_t omap_synctimer_readw(void *opaque, hwaddr addr) { - struct omap_synctimer_s *s =3D (struct omap_synctimer_s *) opaque; + struct omap_synctimer_s *s =3D opaque; =20 switch (addr) { case 0x00: /* 32KSYNCNT_REV */ @@ -55,7 +55,7 @@ static uint32_t omap_synctimer_readw(void *opaque, hwaddr= addr) =20 static uint32_t omap_synctimer_readh(void *opaque, hwaddr addr) { - struct omap_synctimer_s *s =3D (struct omap_synctimer_s *) opaque; + struct omap_synctimer_s *s =3D opaque; uint32_t ret; =20 if (addr & 2) --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673278390; cv=none; d=zohomail.com; s=zohoarc; b=azn5sAvaBwg1yks9Q7/8DbEuQ8oEj2uwM5Jt7HRbZdCKk4ruBjlmhHPwhehAQVNRjP6pPT12EOm9gN9p4KhqW9kS2vC9AOeJywwW4sXyIcr3ifXV0KY964zfFcnkNgVGfSHjRumw2NmMmaU82THKCZS8Ntr5ukgAd64rjsRvz0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673278390; h=Content-Type:Content-Transfer-Encoding:Cc: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=EffXhNSRUGOU0srNkRxQZt0hvLak4UD63gjuSTSSMgQ=; b=IbeO0B7u7tby2S9BTt8/SZ1uCuqAAlf2ZM/pjos5CMXoQRPAH+jT53kmwgczqUXm9H8f4HO+nPP3HeVt8yeRTwkWmQLkOs/Eov8HTO0pcd8zriL07MwJPUP5O/z3YYk0rpsPkgixfb3TKSF7fijwkgx9edp4jVpA1ozQp9lKKPQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673278390045104.4257118836639; Mon, 9 Jan 2023 07:33:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEskR-0001Yq-FX; Mon, 09 Jan 2023 09:03:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEskP-0001Xw-Cz for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:33 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEskM-0006R5-MU for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:33 -0500 Received: by mail-wr1-x42a.google.com with SMTP id bn26so8289396wrb.0 for ; Mon, 09 Jan 2023 06:03:30 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id w6-20020adfd4c6000000b0027cb20605e3sm8529416wrk.105.2023.01.09.06.03.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:03:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EffXhNSRUGOU0srNkRxQZt0hvLak4UD63gjuSTSSMgQ=; b=Ehr3gtxN0uzv/+8Nne6IYdTv2H0LQ5//9I48FoSexbuVkXlPgmp71/L7C0WIG8Y8DH PVqmpHiVywdS0HJCgC49cOJnyna18RVJKoQW9MC/vd8ELMwDWoAOHhiwc5gALIW1MQwQ D1MCTFlFJlyHJo16LynbrrAus3hRYoYLCmJsgkujaLf5TU6+u1n1PGfRVUs3X65WLCxQ nzwu8n41WC6+rWe+bg/VOy6P1orkY4B+E4fjsz8AeiGzqSGa7/X1qo0tJ5S4oIJJBn6X IsX7evA0B1U4vN1RpDv5c1ooEOzZwDHIB/3KAhPnzqzXrH/eXJHHtu+80llfOg0b++uQ Sp+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EffXhNSRUGOU0srNkRxQZt0hvLak4UD63gjuSTSSMgQ=; b=MG17E+IILI5X9Py5yHLrgpYee/K+SDcOFHW8fzAMKcpndrG5VHuV/caWPxne0i4hn+ KH7pKlx96TfdXCBeZTbatjN0TXFmviKigI/cqt9wewJzfik//ilTqrb2ILbRdl94DNqr o8PCzIKL5Ji9nViu/XDCWo626eKiH2uSHCmzBgJV86jUh9CdCcHBsvwzregrc0RXsB/l dQ/+5CBp1DtMYt1qKATotUJhLtc6IGsLtrxLGeMQniXLgznCuyReJzseWCotCnqnG44C YsnVvrrt/C58ii5/Wip1NoLBRPNm+FJsuLQih8d0vCzPgxFe4D6sgX9AtIBautwIvxNa cHGA== X-Gm-Message-State: AFqh2krAYAprbVn8v5GpQOxLrgyYIKoSi8HDgjvPdpYoxWe1LOXX8u4q Akk+H2pv1hjWe109qBP4qRMdAelxkmqmKcU6 X-Google-Smtp-Source: AMrXdXvVCyshJxS2JX/1Fz6BenjQzHi9fgMT199pmSJbin9GYb2fLGaYw7nDDaBjAQExQYCB1AgC2A== X-Received: by 2002:a5d:6145:0:b0:2bb:6b92:d4cc with SMTP id y5-20020a5d6145000000b002bb6b92d4ccmr5386600wrt.53.1673273008808; Mon, 09 Jan 2023 06:03:28 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 04/14] hw/gpio/omap_gpio: Use CamelCase for TYPE_OMAP1_GPIO type name Date: Mon, 9 Jan 2023 15:02:56 +0100 Message-Id: <20230109140306.23161-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673278392270100003 Following docs/devel/style.rst guidelines, rename omap_gpif_s -> Omap1GpioState. This also remove a use of 'struct' in the DECLARE_INSTANCE_CHECKER() macro call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/gpio/omap_gpio.c | 16 ++++++++-------- include/hw/arm/omap.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index b3cb3499bd..23502315ea 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -41,7 +41,7 @@ struct omap_gpio_s { uint16_t pins; }; =20 -struct omap_gpif_s { +struct Omap1GpioState { SysBusDevice parent_obj; =20 MemoryRegion iomem; @@ -53,7 +53,7 @@ struct omap_gpif_s { /* General-Purpose I/O of OMAP1 */ static void omap_gpio_set(void *opaque, int line, int level) { - struct omap_gpif_s *p =3D opaque; + Omap1GpioState *p =3D opaque; struct omap_gpio_s *s =3D &p->omap1; uint16_t prev =3D s->inputs; =20 @@ -594,7 +594,7 @@ static const MemoryRegionOps omap2_gpio_module_ops =3D { =20 static void omap_gpif_reset(DeviceState *dev) { - struct omap_gpif_s *s =3D OMAP1_GPIO(dev); + Omap1GpioState *s =3D OMAP1_GPIO(dev); =20 omap_gpio_reset(&s->omap1); } @@ -677,7 +677,7 @@ static const MemoryRegionOps omap2_gpif_top_ops =3D { static void omap_gpio_init(Object *obj) { DeviceState *dev =3D DEVICE(obj); - struct omap_gpif_s *s =3D OMAP1_GPIO(obj); + Omap1GpioState *s =3D OMAP1_GPIO(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 qdev_init_gpio_in(dev, omap_gpio_set, 16); @@ -690,7 +690,7 @@ static void omap_gpio_init(Object *obj) =20 static void omap_gpio_realize(DeviceState *dev, Error **errp) { - struct omap_gpif_s *s =3D OMAP1_GPIO(dev); + Omap1GpioState *s =3D OMAP1_GPIO(dev); =20 if (!s->clk) { error_setg(errp, "omap-gpio: clk not connected"); @@ -742,13 +742,13 @@ static void omap2_gpio_realize(DeviceState *dev, Erro= r **errp) } } =20 -void omap_gpio_set_clk(omap_gpif *gpio, omap_clk clk) +void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk clk) { gpio->clk =3D clk; } =20 static Property omap_gpio_properties[] =3D { - DEFINE_PROP_INT32("mpu_model", struct omap_gpif_s, mpu_model, 0), + DEFINE_PROP_INT32("mpu_model", Omap1GpioState, mpu_model, 0), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -766,7 +766,7 @@ static void omap_gpio_class_init(ObjectClass *klass, vo= id *data) static const TypeInfo omap_gpio_info =3D { .name =3D TYPE_OMAP1_GPIO, .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(struct omap_gpif_s), + .instance_size =3D sizeof(Omap1GpioState), .instance_init =3D omap_gpio_init, .class_init =3D omap_gpio_class_init, }; diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index ff6a173f8a..29d2ed7e3b 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -103,18 +103,18 @@ void omap_i2c_set_fclk(OMAPI2CState *i2c, omap_clk cl= k); =20 /* omap_gpio.c */ #define TYPE_OMAP1_GPIO "omap-gpio" -DECLARE_INSTANCE_CHECKER(struct omap_gpif_s, OMAP1_GPIO, +typedef struct Omap1GpioState Omap1GpioState; +DECLARE_INSTANCE_CHECKER(Omap1GpioState, OMAP1_GPIO, TYPE_OMAP1_GPIO) =20 #define TYPE_OMAP2_GPIO "omap2-gpio" DECLARE_INSTANCE_CHECKER(struct omap2_gpif_s, OMAP2_GPIO, TYPE_OMAP2_GPIO) =20 -typedef struct omap_gpif_s omap_gpif; typedef struct omap2_gpif_s omap2_gpif; =20 /* TODO: clock framework (see above) */ -void omap_gpio_set_clk(omap_gpif *gpio, omap_clk clk); +void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk clk); =20 void omap2_gpio_set_iclk(omap2_gpif *gpio, omap_clk clk); void omap2_gpio_set_fclk(omap2_gpif *gpio, uint8_t i, omap_clk clk); --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673276332; cv=none; d=zohomail.com; s=zohoarc; b=a6svy7Jh0s2dqfNd8A9wG73eFDHth+XA0/NLBIzRqfHWkDko6UTPCZXyL0OXgns4A451/+9zyDlaJBP5dqWMorWaUG0BUnhtqIrkT+4Uhu7KXzAckCsJdf8kCB+unJXE5MdcIFqNO8QEP50bVFsTu7PnYGfT8Z9RIs0DD+sRf6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673276332; h=Content-Type:Content-Transfer-Encoding:Cc: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=kmxG628TWZ0nrw6bA+Re1tjxcTyz6IlDL5hx2BveKgI=; b=RudFUeTZkwscqwWfUk2Ptd6BrTjXL+y5ZjlqyzlVDMrOUscpHPFb1a72Zy7hlgRknQS9AG4J9W/NUdOtioLievuI33jxnN8kKHv46drvD/sJYEbwOv1bE7UyeaO80fiFFGJkYlpcYa7Z+jJ0pE24wFfbV+vRSR3yl9AOi8nknTE= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673276332836771.3434567127207; Mon, 9 Jan 2023 06:58:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEskU-0001ce-Tn; Mon, 09 Jan 2023 09:03:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEskT-0001Zv-AF for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:37 -0500 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEskR-0006S0-JM for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:37 -0500 Received: by mail-lj1-x229.google.com with SMTP id n5so8404417ljc.9 for ; Mon, 09 Jan 2023 06:03:35 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id x7-20020a05600c188700b003c701c12a17sm15363599wmp.12.2023.01.09.06.03.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:03:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kmxG628TWZ0nrw6bA+Re1tjxcTyz6IlDL5hx2BveKgI=; b=zXJoS5bb9QdrB9PViEuE64yPBo4QFiUZvtjwHgNd3qvsoUCIgAySlRfJzAvdVnBll5 4mRTSHEYHGLkKFSS2602pPE1iluJ594Cl0AsqDVvRlnIC/Wu87QS7o9c932AUmrMDAOp ABAXcpM2uLEJj6D93yr+pBO34CGTm/NpX2fLuPH4NMWjwf6GIHIulOd/V9IjmeYPb0ev pSKrUrNbgtHhTvxN+KOgtBrDqs/1Gt1UiZLQq+YorRCaozM4xuAJ3xFZpoX05v+m/ZI/ /pqa+NkrT7uucGnBO48nh1ol8HoF5HmOMcXfeJPfRs/IylPlwY8iplGcBBh9P0RcHXq4 mxkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kmxG628TWZ0nrw6bA+Re1tjxcTyz6IlDL5hx2BveKgI=; b=szt6drbqGASkwQICj4w2/3PrSmjYSKaqwq0ihsREyNYUpgSgxrRmf8FKxv47W2BiW1 qU99GstzGNsSb/MkML3SbzWVySnExrVcjzN+HW+rewjmOBADxXWoMmyRC3BJGLmZQb6M Tr7tUbH4jgLFS4ymtX9SeX/DUP9o3V8Zx45NqzWuvqXI9U3STzpgj3tRKjw0Io/Kq1cm JYga0PwTRVhVu2Yg2W+GEE2e+StPKbbj7DXPvZeAWiJ1MXxqMXrcpdASGsB3JEspi1+T PfzLF5C3zL5tSLn5qE7ZZkEQOM0Fr0Aop+fgB3vEicMvK/YtakyxkCLNKjtFroKhR1xJ QUsQ== X-Gm-Message-State: AFqh2krH4EcgZCI63iEeeKn9rvDLT75sfMLJIHMeN+W+u7oJFbipRV0J N0lsqrTMV9WY9K8ISmwKxhR4Zg0ER5b0qMdv X-Google-Smtp-Source: AMrXdXu/zDpIv0WWnIqDVts28cEOioVkpF0azYvCtkPyQv6YY/R5/n64X19knwC+EMs8iRZfSZWdAQ== X-Received: by 2002:a2e:b0da:0:b0:27f:dca1:8587 with SMTP id g26-20020a2eb0da000000b0027fdca18587mr9225729ljl.36.1673273013584; Mon, 09 Jan 2023 06:03:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 05/14] hw/gpio/omap_gpio: Use CamelCase for TYPE_OMAP2_GPIO type name Date: Mon, 9 Jan 2023 15:02:57 +0100 Message-Id: <20230109140306.23161-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::229; envelope-from=philmd@linaro.org; helo=mail-lj1-x229.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673276334475100007 Following docs/devel/style.rst guidelines, rename omap2_gpif_s -> Omap2GpioState. This also remove a use of 'struct' in the DECLARE_INSTANCE_CHECKER() macro call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/gpio/omap_gpio.c | 20 ++++++++++---------- include/hw/arm/omap.h | 9 ++++----- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c index 23502315ea..a3341d70f1 100644 --- a/hw/gpio/omap_gpio.c +++ b/hw/gpio/omap_gpio.c @@ -210,7 +210,7 @@ struct omap2_gpio_s { uint8_t delay; }; =20 -struct omap2_gpif_s { +struct Omap2GpioState { SysBusDevice parent_obj; =20 MemoryRegion iomem; @@ -274,7 +274,7 @@ static inline void omap2_gpio_module_int(struct omap2_g= pio_s *s, int line) =20 static void omap2_gpio_set(void *opaque, int line, int level) { - struct omap2_gpif_s *p =3D opaque; + Omap2GpioState *p =3D opaque; struct omap2_gpio_s *s =3D &p->modules[line >> 5]; =20 line &=3D 31; @@ -601,7 +601,7 @@ static void omap_gpif_reset(DeviceState *dev) =20 static void omap2_gpif_reset(DeviceState *dev) { - struct omap2_gpif_s *s =3D OMAP2_GPIO(dev); + Omap2GpioState *s =3D OMAP2_GPIO(dev); int i; =20 for (i =3D 0; i < s->modulecount; i++) { @@ -613,7 +613,7 @@ static void omap2_gpif_reset(DeviceState *dev) =20 static uint64_t omap2_gpif_top_read(void *opaque, hwaddr addr, unsigned si= ze) { - struct omap2_gpif_s *s =3D opaque; + Omap2GpioState *s =3D opaque; =20 switch (addr) { case 0x00: /* IPGENERICOCPSPL_REVISION */ @@ -642,7 +642,7 @@ static uint64_t omap2_gpif_top_read(void *opaque, hwadd= r addr, unsigned size) static void omap2_gpif_top_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap2_gpif_s *s =3D opaque; + Omap2GpioState *s =3D opaque; =20 switch (addr) { case 0x00: /* IPGENERICOCPSPL_REVISION */ @@ -699,7 +699,7 @@ static void omap_gpio_realize(DeviceState *dev, Error *= *errp) =20 static void omap2_gpio_realize(DeviceState *dev, Error **errp) { - struct omap2_gpif_s *s =3D OMAP2_GPIO(dev); + Omap2GpioState *s =3D OMAP2_GPIO(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); int i; =20 @@ -771,19 +771,19 @@ static const TypeInfo omap_gpio_info =3D { .class_init =3D omap_gpio_class_init, }; =20 -void omap2_gpio_set_iclk(omap2_gpif *gpio, omap_clk clk) +void omap2_gpio_set_iclk(Omap2GpioState *gpio, omap_clk clk) { gpio->iclk =3D clk; } =20 -void omap2_gpio_set_fclk(omap2_gpif *gpio, uint8_t i, omap_clk clk) +void omap2_gpio_set_fclk(Omap2GpioState *gpio, uint8_t i, omap_clk clk) { assert(i <=3D 5); gpio->fclk[i] =3D clk; } =20 static Property omap2_gpio_properties[] =3D { - DEFINE_PROP_INT32("mpu_model", struct omap2_gpif_s, mpu_model, 0), + DEFINE_PROP_INT32("mpu_model", Omap2GpioState, mpu_model, 0), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -801,7 +801,7 @@ static void omap2_gpio_class_init(ObjectClass *klass, v= oid *data) static const TypeInfo omap2_gpio_info =3D { .name =3D TYPE_OMAP2_GPIO, .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(struct omap2_gpif_s), + .instance_size =3D sizeof(Omap2GpioState), .class_init =3D omap2_gpio_class_init, }; =20 diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 29d2ed7e3b..9e30ba7ba2 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -108,16 +108,15 @@ DECLARE_INSTANCE_CHECKER(Omap1GpioState, OMAP1_GPIO, TYPE_OMAP1_GPIO) =20 #define TYPE_OMAP2_GPIO "omap2-gpio" -DECLARE_INSTANCE_CHECKER(struct omap2_gpif_s, OMAP2_GPIO, +typedef struct Omap2GpioState Omap2GpioState; +DECLARE_INSTANCE_CHECKER(Omap2GpioState, OMAP2_GPIO, TYPE_OMAP2_GPIO) =20 -typedef struct omap2_gpif_s omap2_gpif; - /* TODO: clock framework (see above) */ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk clk); =20 -void omap2_gpio_set_iclk(omap2_gpif *gpio, omap_clk clk); -void omap2_gpio_set_fclk(omap2_gpif *gpio, uint8_t i, omap_clk clk); +void omap2_gpio_set_iclk(Omap2GpioState *gpio, omap_clk clk); +void omap2_gpio_set_fclk(Omap2GpioState *gpio, uint8_t i, omap_clk clk); =20 /* OMAP2 l4 Interconnect */ struct omap_l4_s; --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673273179; cv=none; d=zohomail.com; s=zohoarc; b=bglUMcDP7IQ0MLW9ZidmcfY3m/x2MYJ/rP5o435GCYRF+p039T/Sf5bHDHnjNEEt2hN9KkpF63lIdHjM+qSAESWJAPYu1Ecy4wHc3PsZtxRJS8HLyFA7zLJepYhAib4TA/3thoOZ51teuubv0zglAYY9GW6U7TY1UtuVMjlF7jM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673273179; h=Content-Type:Content-Transfer-Encoding:Cc: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=XKcKRZWMYZ518k8vvIHwR+oXnEWBYEx606aR+Fxgswo=; b=EGPz6HD4IuXaIPbUB8sjmnzZd+zIa9AsN1T7DcMIH47sb4WzgfWzfcwVC1ipDLL+RJh2KFu0H7VC3VeFrRDKXfa3WCzXZ/DzDoUdL4cGeGS3B/W5UpOUnPKs7qt2b9Tz4LjNUz/pV5JGf/uefgnNfxzytlUq4/SsQHudu8Rtnd8= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673273179819307.4242934340681; Mon, 9 Jan 2023 06:06:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEskc-0001es-LQ; Mon, 09 Jan 2023 09:03:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEskb-0001e4-6y for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:45 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEskZ-0006T8-Aq for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:44 -0500 Received: by mail-wm1-x331.google.com with SMTP id i17-20020a05600c355100b003d99434b1cfso6857897wmq.1 for ; Mon, 09 Jan 2023 06:03:39 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id p9-20020a05600c1d8900b003d9d23ab449sm11965679wms.29.2023.01.09.06.03.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:03:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XKcKRZWMYZ518k8vvIHwR+oXnEWBYEx606aR+Fxgswo=; b=iyXgNVNMV9yy1qppPecBlR5t9gHB6ya4fXUxu/1mCjTTv/vh71qhUp8eX5FbLB2eyx dJOsVto2ylsU0H8PnbpTY6wyXTb+JAid+32ekzeLuW1Vhd5wA+EPavLlGLGF4HUSTM6U toKnHzNCthivWSHd6wZwgxBHwOiuKBb46qZ4N4vXJNg99HQXtQw+YUqckYZvQvItZuu4 XiKHwJgxX50n5vozPF9fL+8DWd4Tz8vVcW3nmmNA8LI//H3Up+FGGxPJVxETZuJ6G7aZ BP4GWMnxadC8awdCks/ip04chdlEuXzWd5PMCilpxbZ84Fz43dsz7j6in20YFntj7fuq lHfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XKcKRZWMYZ518k8vvIHwR+oXnEWBYEx606aR+Fxgswo=; b=uu8aMFg2bethwbVJjPBOaGJKixKoP2IfIiLgEV1s6ANykhGJwQ/JjhGlS+NOFsKj6L zkvGFLShJXWDqLIJkm+RIwGka7T8uCOR+YgS3C2AbLzTueOXzzDaIwphxX77dhIlbcy7 JbjXQU0d/F9gd+c+DcntywlEMVc8HkLiR+qW8wbaNLDsEzCkSrKZzkEhSGxm5hH5nTDj 8cjyvdaOK8jG+tkKVOQbydv/tajzCBcaocrLUAAAQ31EV5wfhlqn4sfHd3+4Qv+UA8NB 69msuaMRCGjYAIhhSHSNut3QBJn87SGhRNS8Gna1KWphdyp81Hfz7TY3B6B4oiOQcV5/ Rcow== X-Gm-Message-State: AFqh2koyg7iUVUd3+hP1XyaLDuB0syFKU/MiG4lLGPp2dKtGJx5wCosj H44jf4cDCo6Hll1SvDtwmvaJGYGJsDjLQWzH X-Google-Smtp-Source: AMrXdXtcydxuVTqKGM1WvG+wcLcVoc245POXyGidIX3kH+8cheZQt7+7Y5Kpg7FqSFbqaTyI6lsnbA== X-Received: by 2002:a05:600c:4e09:b0:3d4:5741:af9b with SMTP id b9-20020a05600c4e0900b003d45741af9bmr50151639wmq.0.1673273018544; Mon, 09 Jan 2023 06:03:38 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 06/14] hw/intc/omap_intc: Use CamelCase for TYPE_OMAP_INTC type name Date: Mon, 9 Jan 2023 15:02:58 +0100 Message-Id: <20230109140306.23161-7-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673273181869100001 Following docs/devel/style.rst guidelines, rename omap_intr_handler_s -> OMAPIntcState. This also remove a use of 'struct' in the DECLARE_INSTANCE_CHECKER() macro call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/intc/omap_intc.c | 38 +++++++++++++++++++------------------- include/hw/arm/omap.h | 9 ++++----- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index 9f6a71ce30..647bf324a8 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -38,7 +38,7 @@ struct omap_intr_handler_bank_s { unsigned char priority[32]; }; =20 -struct omap_intr_handler_s { +struct OMAPIntcState { SysBusDevice parent_obj; =20 qemu_irq *pins; @@ -60,7 +60,7 @@ struct omap_intr_handler_s { struct omap_intr_handler_bank_s bank[3]; }; =20 -static void omap_inth_sir_update(struct omap_intr_handler_s *s, int is_fiq) +static void omap_inth_sir_update(OMAPIntcState *s, int is_fiq) { int i, j, sir_intr, p_intr, p; uint32_t level; @@ -88,7 +88,7 @@ static void omap_inth_sir_update(struct omap_intr_handler= _s *s, int is_fiq) s->sir_intr[is_fiq] =3D sir_intr; } =20 -static inline void omap_inth_update(struct omap_intr_handler_s *s, int is_= fiq) +static inline void omap_inth_update(OMAPIntcState *s, int is_fiq) { int i; uint32_t has_intr =3D 0; @@ -109,7 +109,7 @@ static inline void omap_inth_update(struct omap_intr_ha= ndler_s *s, int is_fiq) =20 static void omap_set_intr(void *opaque, int irq, int req) { - struct omap_intr_handler_s *ih =3D opaque; + OMAPIntcState *ih =3D opaque; uint32_t rise; =20 struct omap_intr_handler_bank_s *bank =3D &ih->bank[irq >> 5]; @@ -136,7 +136,7 @@ static void omap_set_intr(void *opaque, int irq, int re= q) /* Simplified version with no edge detection */ static void omap_set_intr_noedge(void *opaque, int irq, int req) { - struct omap_intr_handler_s *ih =3D opaque; + OMAPIntcState *ih =3D opaque; uint32_t rise; =20 struct omap_intr_handler_bank_s *bank =3D &ih->bank[irq >> 5]; @@ -156,7 +156,7 @@ static void omap_set_intr_noedge(void *opaque, int irq,= int req) static uint64_t omap_inth_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_intr_handler_s *s =3D opaque; + OMAPIntcState *s =3D opaque; int i, offset =3D addr; int bank_no =3D offset >> 8; int line_no; @@ -234,7 +234,7 @@ static uint64_t omap_inth_read(void *opaque, hwaddr add= r, static void omap_inth_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_intr_handler_s *s =3D opaque; + OMAPIntcState *s =3D opaque; int i, offset =3D addr; int bank_no =3D offset >> 8; struct omap_intr_handler_bank_s *bank =3D &s->bank[bank_no]; @@ -336,7 +336,7 @@ static const MemoryRegionOps omap_inth_mem_ops =3D { =20 static void omap_inth_reset(DeviceState *dev) { - struct omap_intr_handler_s *s =3D OMAP_INTC(dev); + OMAPIntcState *s =3D OMAP_INTC(dev); int i; =20 for (i =3D 0; i < s->nbanks; ++i){ @@ -366,7 +366,7 @@ static void omap_inth_reset(DeviceState *dev) static void omap_intc_init(Object *obj) { DeviceState *dev =3D DEVICE(obj); - struct omap_intr_handler_s *s =3D OMAP_INTC(obj); + OMAPIntcState *s =3D OMAP_INTC(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 s->nbanks =3D 1; @@ -380,25 +380,25 @@ static void omap_intc_init(Object *obj) =20 static void omap_intc_realize(DeviceState *dev, Error **errp) { - struct omap_intr_handler_s *s =3D OMAP_INTC(dev); + OMAPIntcState *s =3D OMAP_INTC(dev); =20 if (!s->iclk) { error_setg(errp, "omap-intc: clk not connected"); } } =20 -void omap_intc_set_iclk(omap_intr_handler *intc, omap_clk clk) +void omap_intc_set_iclk(OMAPIntcState *intc, omap_clk clk) { intc->iclk =3D clk; } =20 -void omap_intc_set_fclk(omap_intr_handler *intc, omap_clk clk) +void omap_intc_set_fclk(OMAPIntcState *intc, omap_clk clk) { intc->fclk =3D clk; } =20 static Property omap_intc_properties[] =3D { - DEFINE_PROP_UINT32("size", struct omap_intr_handler_s, size, 0x100), + DEFINE_PROP_UINT32("size", OMAPIntcState, size, 0x100), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -423,7 +423,7 @@ static const TypeInfo omap_intc_info =3D { static uint64_t omap2_inth_read(void *opaque, hwaddr addr, unsigned size) { - struct omap_intr_handler_s *s =3D opaque; + OMAPIntcState *s =3D opaque; int offset =3D addr; int bank_no, line_no; struct omap_intr_handler_bank_s *bank =3D NULL; @@ -504,7 +504,7 @@ static uint64_t omap2_inth_read(void *opaque, hwaddr ad= dr, static void omap2_inth_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct omap_intr_handler_s *s =3D opaque; + OMAPIntcState *s =3D opaque; int offset =3D addr; int bank_no, line_no; struct omap_intr_handler_bank_s *bank =3D NULL; @@ -622,7 +622,7 @@ static const MemoryRegionOps omap2_inth_mem_ops =3D { static void omap2_intc_init(Object *obj) { DeviceState *dev =3D DEVICE(obj); - struct omap_intr_handler_s *s =3D OMAP_INTC(obj); + OMAPIntcState *s =3D OMAP_INTC(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 s->level_only =3D 1; @@ -637,7 +637,7 @@ static void omap2_intc_init(Object *obj) =20 static void omap2_intc_realize(DeviceState *dev, Error **errp) { - struct omap_intr_handler_s *s =3D OMAP_INTC(dev); + OMAPIntcState *s =3D OMAP_INTC(dev); =20 if (!s->iclk) { error_setg(errp, "omap2-intc: iclk not connected"); @@ -650,7 +650,7 @@ static void omap2_intc_realize(DeviceState *dev, Error = **errp) } =20 static Property omap2_intc_properties[] =3D { - DEFINE_PROP_UINT8("revision", struct omap_intr_handler_s, + DEFINE_PROP_UINT8("revision", OMAPIntcState, revision, 0x21), DEFINE_PROP_END_OF_LIST(), }; @@ -676,7 +676,7 @@ static const TypeInfo omap2_intc_info =3D { static const TypeInfo omap_intc_type_info =3D { .name =3D TYPE_OMAP_INTC, .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(omap_intr_handler), + .instance_size =3D sizeof(OMAPIntcState), .abstract =3D true, }; =20 diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 9e30ba7ba2..c275d9b681 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -70,9 +70,8 @@ void omap_clk_reparent(omap_clk clk, omap_clk parent); =20 /* omap_intc.c */ #define TYPE_OMAP_INTC "common-omap-intc" -typedef struct omap_intr_handler_s omap_intr_handler; -DECLARE_INSTANCE_CHECKER(omap_intr_handler, OMAP_INTC, - TYPE_OMAP_INTC) +typedef struct OMAPIntcState OMAPIntcState; +DECLARE_INSTANCE_CHECKER(OMAPIntcState, OMAP_INTC, TYPE_OMAP_INTC) =20 =20 /* @@ -89,8 +88,8 @@ DECLARE_INSTANCE_CHECKER(omap_intr_handler, OMAP_INTC, * (ie the struct omap_mpu_state_s*) to do the clockname to pointer * translation.) */ -void omap_intc_set_iclk(omap_intr_handler *intc, omap_clk clk); -void omap_intc_set_fclk(omap_intr_handler *intc, omap_clk clk); +void omap_intc_set_iclk(OMAPIntcState *intc, omap_clk clk); +void omap_intc_set_fclk(OMAPIntcState *intc, omap_clk clk); =20 /* omap_i2c.c */ #define TYPE_OMAP_I2C "omap_i2c" --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673274107; cv=none; d=zohomail.com; s=zohoarc; b=koXAM+4LuPWaGrWK5lL5IfErZwcXkOh0iiPOtGsCCwQGd2zUgjjviTttUmp1ksZncxpydp7MV1cfw/s3k4mEGqjuQP/QmSgRmhukvm/l93WDCwzjyjrQS8vU6AYM0/QbgX4ZE9bLDly+D40pKgCPHIEP76EGre7UOId3yALwdDE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673274107; h=Content-Type:Content-Transfer-Encoding:Cc: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=T4pU3THaws02dfbgdVpDCPkXfJOk73OCnszjjkzMNl4=; b=J94nrKP3o9tw6CbgQRa4/0FgbB3ajkFC/F9TjCJHTElT2DgDiwejVKcgKjen/FoWAJW5k4GK6lhCtD86g28ZFgBwmAwZxn5WfmoU66St0U2osYvKaeuttr7B64ByUc0OCUV9O2VRIIh8QIvJni8T8vUtOYFng84USE27RmnI828= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673274107001139.85794377895627; Mon, 9 Jan 2023 06:21:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEske-0001fe-0v; Mon, 09 Jan 2023 09:03:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEskc-0001f0-MO for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:46 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEskb-0006To-5X for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:46 -0500 Received: by mail-wr1-x432.google.com with SMTP id d17so8270029wrs.2 for ; Mon, 09 Jan 2023 06:03:44 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id bj7-20020a0560001e0700b002b6667d3adfsm8669224wrb.80.2023.01.09.06.03.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:03:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T4pU3THaws02dfbgdVpDCPkXfJOk73OCnszjjkzMNl4=; b=gTpYscWWuHEBwMkxY0fZdyOxp0QtqCaE7idC+8KSKcGMp5Mkr5ViyWdzuhpuhCevq8 +Br5RuwHGqXVC+t57bmkbNLQtUqgLRUfwaFaraVeKc6DeQ5PNECe9s9GQZzA3oY7bcd6 ctf+G/YdW0kXFCIk+3BWwAbFZsNBA4FbdToVY5K7InC0iBw464duE8S16UrBsowRxpAO hhvgHckhUnZRRbVC99PXboNN+Tk6FaxUtrEedquM9+2++LzzI84P9Tvg1d183JnD9DAV 4adWDeJZiFOOHgj5GJzrtWz51fGPSzliz7IoAo8LH2D1725mHQOLwU+v1d6uR1xxr6Qm Q+TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T4pU3THaws02dfbgdVpDCPkXfJOk73OCnszjjkzMNl4=; b=FZ1QxqkiAef5IuXFH8WkfSUOvml5yJJnp6DsIkVr/2TLgjpH/B7TNxnVfcl9Xq7ASx GNySTTgUeiJzsXkeLOtGKZ7O3xF3OPOzNSLayQTdjo3xgrdElmwcV7Kl+DXjtZ47O5Pw xbdybWSG2YULTtI2+rUQKk/QFOcGrPB+Omu9Lox1ltt8bhZ36O4ig5AqnUxbHkgZRtwt DejGUNbsv7Am+c/QN1iZQR8JT7whhBeyzEm7l/FHZL7se6evHUtUFuhMxgBaG9jpMeZd PAXN4R3I7EpN1P8Tsacv5uCIoyGYXxLTVQlhuChWMY05jpAZTik9q8VpEqqiz2tGdykk lKzQ== X-Gm-Message-State: AFqh2ko5hn1aRzLIgaoohhHCHU9KfZ+ORigQ2bGjJYjGg5TbxtSspQH6 89aK7aBhTnDDKhCUi/bouNH3UQO4BBGiKoEg X-Google-Smtp-Source: AMrXdXuP42eQq7tzgtH5gvbnKPmk+Dgv7SrxyRA9JHud1/kiy9YM03d30r4uDgIeE/emeysBszOl+w== X-Received: by 2002:a5d:430e:0:b0:279:53e1:5178 with SMTP id h14-20020a5d430e000000b0027953e15178mr32269083wrq.45.1673273023529; Mon, 09 Jan 2023 06:03:43 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 07/14] hw/arm/stellaris: Drop useless casts from void * to pointer Date: Mon, 9 Jan 2023 15:02:59 +0100 Message-Id: <20230109140306.23161-8-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673274109192100003 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/stellaris.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index a9e96c37f8..051c242e9d 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -749,7 +749,7 @@ static void stellaris_adc_update(stellaris_adc_state *s) =20 static void stellaris_adc_trigger(void *opaque, int irq, int level) { - stellaris_adc_state *s =3D (stellaris_adc_state *)opaque; + stellaris_adc_state *s =3D opaque; int n; =20 for (n =3D 0; n < 4; n++) { @@ -785,7 +785,7 @@ static void stellaris_adc_reset(stellaris_adc_state *s) static uint64_t stellaris_adc_read(void *opaque, hwaddr offset, unsigned size) { - stellaris_adc_state *s =3D (stellaris_adc_state *)opaque; + stellaris_adc_state *s =3D opaque; =20 /* TODO: Implement this. */ if (offset >=3D 0x40 && offset < 0xc0) { @@ -833,7 +833,7 @@ static uint64_t stellaris_adc_read(void *opaque, hwaddr= offset, static void stellaris_adc_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - stellaris_adc_state *s =3D (stellaris_adc_state *)opaque; + stellaris_adc_state *s =3D opaque; =20 /* TODO: Implement this. */ if (offset >=3D 0x40 && offset < 0xc0) { --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673274112; cv=none; d=zohomail.com; s=zohoarc; b=cdcsoqyfNmIA1lmHFoJkD06RQH19eihwVlppvqE4A+gSYD6ebHPWL5GF81uYOdBHr7R7m/dMhuD7sVdqkNHcRqIufiY1Mgc4c6Sh4o7Bw9DTNSsrKjFs2/xDxs+tsFdjj+4xNiItFHy6br4uOF6lSW8F07Um+KFiL0AMu+MVN0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673274112; h=Content-Type:Content-Transfer-Encoding:Cc: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=at2rPrXos7OhXzrKy6FKQhkvRO9+YPfQmyazxY/f4vY=; b=JfrmHKBOj3SIfs+g31iIRpERHsSc/RWyNjLds4uetyShbkRfo5AjyY/zfdLtWnFWzn80edQ9TYQjTpjfGpIlZv6H/8ksORqrba6gpDc1p2clbkEr2nMJncYlFGV0q2ADA/dP6HabDGfUItvugidn4akWT5hNS0DcsylCku8AwAA= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167327411283211.189649998951722; Mon, 9 Jan 2023 06:21:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEskm-0001iX-Uw; Mon, 09 Jan 2023 09:03:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEski-0001hO-6P for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:55 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEskg-0006Uw-3I for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:51 -0500 Received: by mail-wm1-x32d.google.com with SMTP id m8-20020a05600c3b0800b003d96f801c48so9096466wms.0 for ; Mon, 09 Jan 2023 06:03:49 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id q6-20020a05600c46c600b003cfd4e6400csm12332793wmo.19.2023.01.09.06.03.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:03:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=at2rPrXos7OhXzrKy6FKQhkvRO9+YPfQmyazxY/f4vY=; b=YbMvkcbzDvBLuVCKjauNTN6m4KvgJHiESOqYR/LwgEt1KCh/FbhXTzJVGg83WuQ7U5 CHGHbflZu7s4OgUis42rH2C2G/W/+Bv3KYw2tmV1qQHWIVL2bhSIIo1kwPshVGBi0GHq Y98Mhh0LOSzYjsWQrloHQxKV9WAQ0gR8wfQbGw2xVREbfGXSOpmF5poSnduLEtipSCCx xvpZcpAdZXMPW8HUgRgs0ahNsjnBFAh16pSXiPDojDjuFaHe/frGgw1Bzh1sulDnM6jf O6QARHLXgrBITxcXR02xTW6Qry/3uFyF4zhpGwsGGf/XwU2dSGEHUGm+x3POXZMkI0rb gOBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=at2rPrXos7OhXzrKy6FKQhkvRO9+YPfQmyazxY/f4vY=; b=plzK4+t8gLdGevGKJPsb8KD7H6YLn6h5TZiEa5gJ6eigVTj8cKWa28RzEoSvjLwVlF ADqt/R9s6lPqO6kyEqsIDtJ7D6h52Vg+Z2CmFGpzl2ZL4E4Lp+XFD9B2MKR53jzot/OT tvsRSTjGxZ5etMQbMad1SOZQ6GmvCuD6iXEPMQdgb7IrHnp5bElnqhLfPGlavsYTX+Oc YzF5tsFb4frkSP0jX91iz/eokp8smN4Mrne5H8OVxCPNp7I421cVHy4TW1mhqQ7eqvOi UmTWu6PUXBCOeIiuL4tb93q/Df4HILMWEmbJOGZK39DgqDCPg5/v0/dqslGawGDoNQUw VdFg== X-Gm-Message-State: AFqh2konKRAFrMfjd2GmctTO8uvfQ9C6Tdupv5Q9z5yoQoEgta2R3lvb lPbkQIv0NyKQNQ6vrz+fWOjd9zcdi0MEd5zC X-Google-Smtp-Source: AMrXdXugVTj9YZ1HLJWPFNUjuH3efWCsehWBPuN5W5emedICa/QO9JbNTL+M0swzEu3AL3abNRWqtQ== X-Received: by 2002:a05:600c:34ce:b0:3cf:614e:b587 with SMTP id d14-20020a05600c34ce00b003cf614eb587mr49711410wmq.26.1673273028431; Mon, 09 Jan 2023 06:03:48 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 08/14] hw/arm/stellaris: Use CamelCase for STELLARIS_ADC type name Date: Mon, 9 Jan 2023 15:03:00 +0100 Message-Id: <20230109140306.23161-9-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673274113123100001 Following docs/devel/style.rst guidelines, rename stellaris_adc_state -> StellarisADCState. This also remove a use of 'struct' in the DECLARE_INSTANCE_CHECKER() macro call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/stellaris.c | 73 +++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 051c242e9d..67a2293d35 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -674,9 +674,8 @@ static void stellaris_i2c_init(Object *obj) #define STELLARIS_ADC_FIFO_FULL 0x1000 =20 #define TYPE_STELLARIS_ADC "stellaris-adc" -typedef struct StellarisADCState stellaris_adc_state; -DECLARE_INSTANCE_CHECKER(stellaris_adc_state, STELLARIS_ADC, - TYPE_STELLARIS_ADC) +typedef struct StellarisADCState StellarisADCState; +DECLARE_INSTANCE_CHECKER(StellarisADCState, STELLARIS_ADC, TYPE_STELLARIS_= ADC) =20 struct StellarisADCState { SysBusDevice parent_obj; @@ -700,7 +699,7 @@ struct StellarisADCState { qemu_irq irq[4]; }; =20 -static uint32_t stellaris_adc_fifo_read(stellaris_adc_state *s, int n) +static uint32_t stellaris_adc_fifo_read(StellarisADCState *s, int n) { int tail; =20 @@ -716,7 +715,7 @@ static uint32_t stellaris_adc_fifo_read(stellaris_adc_s= tate *s, int n) return s->fifo[n].data[tail]; } =20 -static void stellaris_adc_fifo_write(stellaris_adc_state *s, int n, +static void stellaris_adc_fifo_write(StellarisADCState *s, int n, uint32_t value) { int head; @@ -736,7 +735,7 @@ static void stellaris_adc_fifo_write(stellaris_adc_stat= e *s, int n, s->fifo[n].state |=3D STELLARIS_ADC_FIFO_FULL; } =20 -static void stellaris_adc_update(stellaris_adc_state *s) +static void stellaris_adc_update(StellarisADCState *s) { int level; int n; @@ -749,7 +748,7 @@ static void stellaris_adc_update(stellaris_adc_state *s) =20 static void stellaris_adc_trigger(void *opaque, int irq, int level) { - stellaris_adc_state *s =3D opaque; + StellarisADCState *s =3D opaque; int n; =20 for (n =3D 0; n < 4; n++) { @@ -771,7 +770,7 @@ static void stellaris_adc_trigger(void *opaque, int irq= , int level) } } =20 -static void stellaris_adc_reset(stellaris_adc_state *s) +static void stellaris_adc_reset(StellarisADCState *s) { int n; =20 @@ -785,7 +784,7 @@ static void stellaris_adc_reset(stellaris_adc_state *s) static uint64_t stellaris_adc_read(void *opaque, hwaddr offset, unsigned size) { - stellaris_adc_state *s =3D opaque; + StellarisADCState *s =3D opaque; =20 /* TODO: Implement this. */ if (offset >=3D 0x40 && offset < 0xc0) { @@ -833,7 +832,7 @@ static uint64_t stellaris_adc_read(void *opaque, hwaddr= offset, static void stellaris_adc_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - stellaris_adc_state *s =3D opaque; + StellarisADCState *s =3D opaque; =20 /* TODO: Implement this. */ if (offset >=3D 0x40 && offset < 0xc0) { @@ -901,31 +900,31 @@ static const VMStateDescription vmstate_stellaris_adc= =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_UINT32(actss, stellaris_adc_state), - VMSTATE_UINT32(ris, stellaris_adc_state), - VMSTATE_UINT32(im, stellaris_adc_state), - VMSTATE_UINT32(emux, stellaris_adc_state), - VMSTATE_UINT32(ostat, stellaris_adc_state), - VMSTATE_UINT32(ustat, stellaris_adc_state), - VMSTATE_UINT32(sspri, stellaris_adc_state), - VMSTATE_UINT32(sac, stellaris_adc_state), - VMSTATE_UINT32(fifo[0].state, stellaris_adc_state), - VMSTATE_UINT32_ARRAY(fifo[0].data, stellaris_adc_state, 16), - VMSTATE_UINT32(ssmux[0], stellaris_adc_state), - VMSTATE_UINT32(ssctl[0], stellaris_adc_state), - VMSTATE_UINT32(fifo[1].state, stellaris_adc_state), - VMSTATE_UINT32_ARRAY(fifo[1].data, stellaris_adc_state, 16), - VMSTATE_UINT32(ssmux[1], stellaris_adc_state), - VMSTATE_UINT32(ssctl[1], stellaris_adc_state), - VMSTATE_UINT32(fifo[2].state, stellaris_adc_state), - VMSTATE_UINT32_ARRAY(fifo[2].data, stellaris_adc_state, 16), - VMSTATE_UINT32(ssmux[2], stellaris_adc_state), - VMSTATE_UINT32(ssctl[2], stellaris_adc_state), - VMSTATE_UINT32(fifo[3].state, stellaris_adc_state), - VMSTATE_UINT32_ARRAY(fifo[3].data, stellaris_adc_state, 16), - VMSTATE_UINT32(ssmux[3], stellaris_adc_state), - VMSTATE_UINT32(ssctl[3], stellaris_adc_state), - VMSTATE_UINT32(noise, stellaris_adc_state), + VMSTATE_UINT32(actss, StellarisADCState), + VMSTATE_UINT32(ris, StellarisADCState), + VMSTATE_UINT32(im, StellarisADCState), + VMSTATE_UINT32(emux, StellarisADCState), + VMSTATE_UINT32(ostat, StellarisADCState), + VMSTATE_UINT32(ustat, StellarisADCState), + VMSTATE_UINT32(sspri, StellarisADCState), + VMSTATE_UINT32(sac, StellarisADCState), + VMSTATE_UINT32(fifo[0].state, StellarisADCState), + VMSTATE_UINT32_ARRAY(fifo[0].data, StellarisADCState, 16), + VMSTATE_UINT32(ssmux[0], StellarisADCState), + VMSTATE_UINT32(ssctl[0], StellarisADCState), + VMSTATE_UINT32(fifo[1].state, StellarisADCState), + VMSTATE_UINT32_ARRAY(fifo[1].data, StellarisADCState, 16), + VMSTATE_UINT32(ssmux[1], StellarisADCState), + VMSTATE_UINT32(ssctl[1], StellarisADCState), + VMSTATE_UINT32(fifo[2].state, StellarisADCState), + VMSTATE_UINT32_ARRAY(fifo[2].data, StellarisADCState, 16), + VMSTATE_UINT32(ssmux[2], StellarisADCState), + VMSTATE_UINT32(ssctl[2], StellarisADCState), + VMSTATE_UINT32(fifo[3].state, StellarisADCState), + VMSTATE_UINT32_ARRAY(fifo[3].data, StellarisADCState, 16), + VMSTATE_UINT32(ssmux[3], StellarisADCState), + VMSTATE_UINT32(ssctl[3], StellarisADCState), + VMSTATE_UINT32(noise, StellarisADCState), VMSTATE_END_OF_LIST() } }; @@ -933,7 +932,7 @@ static const VMStateDescription vmstate_stellaris_adc = =3D { static void stellaris_adc_init(Object *obj) { DeviceState *dev =3D DEVICE(obj); - stellaris_adc_state *s =3D STELLARIS_ADC(obj); + StellarisADCState *s =3D STELLARIS_ADC(obj); SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); int n; =20 @@ -1381,7 +1380,7 @@ static void stellaris_adc_class_init(ObjectClass *kla= ss, void *data) static const TypeInfo stellaris_adc_info =3D { .name =3D TYPE_STELLARIS_ADC, .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(stellaris_adc_state), + .instance_size =3D sizeof(StellarisADCState), .instance_init =3D stellaris_adc_init, .class_init =3D stellaris_adc_class_init, }; --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673276079; cv=none; d=zohomail.com; s=zohoarc; b=P3beRalo/F+Y9X75d5qr/b7fwzdvljHH2DflirU4ytP3Et1BRT3o6tvgmUSG8kcP9taYO+JqfqytyEp4MtbEkH4LPA3T8Ykategv4kXvHgyW6OvHfeKFN8GAsTu57dA4og8dcwttqk1QKZNYVMPUzWspkljrpSpMT0U7EI8HxsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673276079; h=Content-Type:Content-Transfer-Encoding:Cc: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=aIhg+s5O4aJ/tYVo4sVxeOk6SdlJhgUlESHjMAxmSzc=; b=ZCtFULK4bErHHSu2g14DxInmSOV+x10oqTrPr28N8OkSaykRHHleuF1BWr54On6PTSKYZUweRpexa2gcI4slKOMelMKTKKB5LNniVlmBsmLpVc9urrcG39FlYHBI8VeKZ8AOOySVcCBt/qdB05+nZzgAk2NUy2jhe3ryFtcAnrQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673276079544176.2987054686772; Mon, 9 Jan 2023 06:54:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEsko-0001jQ-DE; Mon, 09 Jan 2023 09:03:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEskn-0001jA-Pg for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:57 -0500 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEskl-0006WF-Gn for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:03:57 -0500 Received: by mail-lf1-x12a.google.com with SMTP id v25so13071716lfe.12 for ; Mon, 09 Jan 2023 06:03:55 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id k4-20020a05600c1c8400b003d22528decesm18480217wms.43.2023.01.09.06.03.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:03:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aIhg+s5O4aJ/tYVo4sVxeOk6SdlJhgUlESHjMAxmSzc=; b=l/zKM0Pwa3jr7rVU6rO+nxm/qCoem0rZvh7poReOaAkzYthjRHOpuu/B42U4qeB1+v SwYaZDJhIFOHmuudbm972z6H9/ZiQbG7TWwPdKBsxmKi3DAMT548CjVL4Po1FDnPqapK 7F/CSZqETYtTAsU1GYQO+VTisp3vbRbP2vppDQUB4DqWhlHNbptLt7e0OfyTkl9MHTSN Bk4QzNBRJTPyVQiKe3eJlvY4ZgzSbDTOOUDKZD6gM59HZp6a1tmIupboXOmiyI6Io1sS 9h0eta11kF93GBR0MZ6gsygPQvAfe8d+CyLtl9WUG93ooluBqJFeeqRDiAaT5icOYcAs Fu7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aIhg+s5O4aJ/tYVo4sVxeOk6SdlJhgUlESHjMAxmSzc=; b=02KwUriYY00svS94GPb7wU0r2+TTWsiu28pXVOWl48/i8s1tyNvaWqM6WXOzr8uty4 Rwk4lgKG9E4GPFaOhn/Hy9vXKN2edxrIr9eWpFZ9ia63aeh0r0FnOC1BU1FaBwNjqXDh crXJA0GAHjkm7sEo3LIN/3ahDqIz58L7ztX1jDwCdfYhuqC+WJCbYFxbLWRjKHFecuB7 5DrpQTxSue+r0v2uhbBgqZmX2abrEHA2+AAW83nCwUrKrMlsisuIWwJZRbIRgoCmopj+ rXt9z/zcyLnl5ZkCDJkp8gf/WcZfmscxuRe3SA7NtNVgOKNpjsBaYSygz8L/AiaKqmFu O7Zg== X-Gm-Message-State: AFqh2ko72WCZQTCoHIwzyCakknPgAh7f2+TA8zq5T8eJrPCtezOpLF1V HFiAdVCnGO3eKa2xNIdhbnA/Vfu0jOEsxa/N X-Google-Smtp-Source: AMrXdXsaRFIv0Q19DBGJvnjxpajbkVwWXG+SFYHzRDzsq8JvrXvpN1oZ6dbDQB1XQE0sfcTPVRXePQ== X-Received: by 2002:a05:6512:3d2a:b0:4ae:7974:7d32 with SMTP id d42-20020a0565123d2a00b004ae79747d32mr165993lfv.29.1673273033496; Mon, 09 Jan 2023 06:03:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 09/14] hw/arm/bcm2836: Remove definitions generated by OBJECT_DECLARE_TYPE() Date: Mon, 9 Jan 2023 15:03:01 +0100 Message-Id: <20230109140306.23161-10-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::12a; envelope-from=philmd@linaro.org; helo=mail-lf1-x12a.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673276081029100001 The typedef and definitions are generated by the OBJECT_DECLARE_TYPE macro in "hw/arm/bcm2836.h": 20 #define TYPE_BCM283X "bcm283x" 21 OBJECT_DECLARE_TYPE(BCM283XState, BCM283XClass, BCM283X) The script ran in commit a489d1951c ("Use OBJECT_DECLARE_TYPE when possible") missed them because they are declared in a different file unit. Remove them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/bcm2836.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 24354338ca..f894338fc6 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -16,7 +16,7 @@ #include "hw/arm/raspi_platform.h" #include "hw/sysbus.h" =20 -typedef struct BCM283XClass { +struct BCM283XClass { /*< private >*/ DeviceClass parent_class; /*< public >*/ @@ -26,12 +26,7 @@ typedef struct BCM283XClass { hwaddr peri_base; /* Peripheral base address seen by the CPU */ hwaddr ctrl_base; /* Interrupt controller and mailboxes etc. */ int clusterid; -} BCM283XClass; - -#define BCM283X_CLASS(klass) \ - OBJECT_CLASS_CHECK(BCM283XClass, (klass), TYPE_BCM283X) -#define BCM283X_GET_CLASS(obj) \ - OBJECT_GET_CLASS(BCM283XClass, (obj), TYPE_BCM283X) +}; =20 static Property bcm2836_enabled_cores_property =3D DEFINE_PROP_UINT32("enabled-cpus", BCM283XState, enabled_cpus, 0); --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673273999; cv=none; d=zohomail.com; s=zohoarc; b=QdodSrVjNySCuppnqCugS7o1YSfs/D/4KyeHl/i9UL2AysM6r3Qs/Q8Mv/oY28S0p/zAuYTsUp0u7TpzAAEmYG8KXQXa+ZoMB3QdyWju9RtMpihyjY/crQk8iAHJBTeoBibPdMtUYZzf6ZXpxxRD0TWUlrXecI30NvWkJrxoUHw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673273999; h=Content-Type:Content-Transfer-Encoding:Cc: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=jRUzznDEJ6kakLGhAZbOD3VcgJyHcfc9OyelkV2R1Lo=; b=GIrVeb+okaCVWRTEIpiOs20oassNxA210ilOQMk5hU8zSeR/VBykb7tD/LEkZXIuvDAYgLA2QV81sRuiAq5m5HAN7N9vUKncG0hozZIv+INIWnmJhw5l4SONxSsFQ+E4Y3O5JxZF2e4LDop1YjNfBjtj3Xlq35KDJmbYlli86kc= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673273999290161.00013975732975; Mon, 9 Jan 2023 06:19:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEsl3-0001n5-RX; Mon, 09 Jan 2023 09:04:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEskt-0001kp-7E for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:03 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEskq-0006hz-5Y for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:02 -0500 Received: by mail-wr1-x42d.google.com with SMTP id r2so8260436wrv.7 for ; Mon, 09 Jan 2023 06:03:59 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id k2-20020a5d5182000000b00236545edc91sm8761504wrv.76.2023.01.09.06.03.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:03:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jRUzznDEJ6kakLGhAZbOD3VcgJyHcfc9OyelkV2R1Lo=; b=btg5pIBALEQkmXYpw+Da8lJr1eqx6tfYB483fUP1sWx6tDNgT6PQYsbvF45VBe5Uxb M+6VWwqOt2OlEFv+Ex70/SG7a1EcwXexXH6UCEtV9UDoBW3/9W0t4IRXvAvqakkCW1nS fC1e3EitWwSWiksNyy1HSvg5a3x2btKolUaJrskyvOcmaTFwQrKVVq3x3MUaGjvMmci+ M5/+wFUCVkJj2/+rgC1D+m0bovO6W2dQ9e40tqNclSKi/uEMzUS8BN4HpOHLWp23PL97 rP32aEEjUaxfR8h4Ckd0pmlvVu1YJZ4zkiMNygmNr4Mg7/96Or5xOjPB/Mqy4W3spx+a Wt0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jRUzznDEJ6kakLGhAZbOD3VcgJyHcfc9OyelkV2R1Lo=; b=quOyASP+1R8Y4DcASoa1gqR1EJ/mCjjFd6qC13vzwzgWXaZNe8pbiX3qzSLGRddNai EqzFh25ESks1J0U0WXnVscqJcLxKOOflT3BN4VtPqvgCWwJacuYzTr3Ugt9ONgPa6q5G zF02HlQ47NenayRSP+JjvWMB1ODfB7KxisY64Nob49gi8NSaVILSNMD81FfwsYMh/IfM A/iwZVx8I9GnLzhvKl5z6A6HtyfAekIkmQdahF+o/lpBrcAHImROmyafybWTvLMHHl34 qTo5Zm6Wf9qIeCs2TTyeQQICWwdExlkeWn6bNrUusVop+H8tdmDCCtS1l0GaUYT1B8AX j8QQ== X-Gm-Message-State: AFqh2kqpeKpyoHGHv4VhUELcFs9U7q+ieSkr2YpfV0rIQsrmbFpG52S9 iYKh4iNT2diuqRgGpMDpQL+ndGZR1YXctHOJ X-Google-Smtp-Source: AMrXdXvXIci2Nebp9sTQBcgHakGkw8hWZbQOiWpYWekspDWyRO1YXwK8IM8eeZ9zph8OSHYHTHLSDQ== X-Received: by 2002:a05:6000:4087:b0:2bb:db44:7994 with SMTP id da7-20020a056000408700b002bbdb447994mr5279890wrb.28.1673273038349; Mon, 09 Jan 2023 06:03:58 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 10/14] hw/arm/npcm7xx: Declare QOM macros using OBJECT_DECLARE_SIMPLE_TYPE() Date: Mon, 9 Jan 2023 15:03:02 +0100 Message-Id: <20230109140306.23161-11-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673274000216100003 NPCM7XX models have been commited after the conversion from commit 8063396bf3 ("Use OBJECT_DECLARE_SIMPLE_TYPE when possible"). Manually convert them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/adc/npcm7xx_adc.h | 7 +++---- include/hw/arm/npcm7xx.h | 18 ++++++------------ include/hw/i2c/npcm7xx_smbus.h | 7 +++---- include/hw/misc/npcm7xx_clk.h | 2 +- include/hw/misc/npcm7xx_gcr.h | 6 +++--- include/hw/misc/npcm7xx_mft.h | 7 +++---- include/hw/misc/npcm7xx_pwm.h | 3 +-- include/hw/misc/npcm7xx_rng.h | 6 +++--- include/hw/net/npcm7xx_emc.h | 5 +---- include/hw/sd/npcm7xx_sdhci.h | 4 ++-- 10 files changed, 26 insertions(+), 39 deletions(-) diff --git a/include/hw/adc/npcm7xx_adc.h b/include/hw/adc/npcm7xx_adc.h index 7d8442107a..93330a408d 100644 --- a/include/hw/adc/npcm7xx_adc.h +++ b/include/hw/adc/npcm7xx_adc.h @@ -42,7 +42,7 @@ * @iref: The internal reference voltage, initialized at launch time. * @rv: The calibrated output values of 0.5V and 1.5V for the ADC. */ -typedef struct { +struct NPCM7xxADCState { SysBusDevice parent; =20 MemoryRegion iomem; @@ -60,10 +60,9 @@ typedef struct { uint32_t iref; =20 uint16_t calibration_r_values[NPCM7XX_ADC_NUM_CALIB]; -} NPCM7xxADCState; +}; =20 #define TYPE_NPCM7XX_ADC "npcm7xx-adc" -#define NPCM7XX_ADC(obj) \ - OBJECT_CHECK(NPCM7xxADCState, (obj), TYPE_NPCM7XX_ADC) +OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxADCState, NPCM7XX_ADC) =20 #endif /* NPCM7XX_ADC_H */ diff --git a/include/hw/arm/npcm7xx.h b/include/hw/arm/npcm7xx.h index ce593235d9..f1b7e4a48d 100644 --- a/include/hw/arm/npcm7xx.h +++ b/include/hw/arm/npcm7xx.h @@ -52,7 +52,7 @@ =20 #define NPCM7XX_NR_PWM_MODULES 2 =20 -typedef struct NPCM7xxMachine { +struct NPCM7xxMachine { MachineState parent; /* * PWM fan splitter. each splitter connects to one PWM output and @@ -60,11 +60,10 @@ typedef struct NPCM7xxMachine { */ SplitIRQ fan_splitter[NPCM7XX_NR_PWM_MODULES * NPCM7XX_PWM_PER_MODULE]; -} NPCM7xxMachine; +}; =20 #define TYPE_NPCM7XX_MACHINE MACHINE_TYPE_NAME("npcm7xx") -#define NPCM7XX_MACHINE(obj) \ - OBJECT_CHECK(NPCM7xxMachine, (obj), TYPE_NPCM7XX_MACHINE) +OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxMachine, NPCM7XX_MACHINE) =20 typedef struct NPCM7xxMachineClass { MachineClass parent; @@ -77,7 +76,7 @@ typedef struct NPCM7xxMachineClass { #define NPCM7XX_MACHINE_GET_CLASS(obj) \ OBJECT_GET_CLASS(NPCM7xxMachineClass, (obj), TYPE_NPCM7XX_MACHINE) =20 -typedef struct NPCM7xxState { +struct NPCM7xxState { DeviceState parent; =20 ARMCPU cpu[NPCM7XX_MAX_NUM_CPUS]; @@ -105,10 +104,10 @@ typedef struct NPCM7xxState { NPCM7xxFIUState fiu[2]; NPCM7xxEMCState emc[2]; NPCM7xxSDHCIState mmc; -} NPCM7xxState; +}; =20 #define TYPE_NPCM7XX "npcm7xx" -#define NPCM7XX(obj) OBJECT_CHECK(NPCM7xxState, (obj), TYPE_NPCM7XX) +OBJECT_DECLARE_TYPE(NPCM7xxState, NPCM7xxClass, NPCM7XX) =20 #define TYPE_NPCM730 "npcm730" #define TYPE_NPCM750 "npcm750" @@ -122,11 +121,6 @@ typedef struct NPCM7xxClass { uint32_t num_cpus; } NPCM7xxClass; =20 -#define NPCM7XX_CLASS(klass) \ - OBJECT_CLASS_CHECK(NPCM7xxClass, (klass), TYPE_NPCM7XX) -#define NPCM7XX_GET_CLASS(obj) \ - OBJECT_GET_CLASS(NPCM7xxClass, (obj), TYPE_NPCM7XX) - /** * npcm7xx_load_kernel - Loads memory with everything needed to boot * @machine - The machine containing the SoC to be booted. diff --git a/include/hw/i2c/npcm7xx_smbus.h b/include/hw/i2c/npcm7xx_smbus.h index 7d59ee917e..3555e6836f 100644 --- a/include/hw/i2c/npcm7xx_smbus.h +++ b/include/hw/i2c/npcm7xx_smbus.h @@ -68,7 +68,7 @@ typedef enum NPCM7xxSMBusStatus { * @rx_cur: The current position of rx_fifo. * @status: The current status of the SMBus. */ -typedef struct NPCM7xxSMBusState { +struct NPCM7xxSMBusState { SysBusDevice parent; =20 MemoryRegion iomem; @@ -104,10 +104,9 @@ typedef struct NPCM7xxSMBusState { uint8_t rx_cur; =20 NPCM7xxSMBusStatus status; -} NPCM7xxSMBusState; +}; =20 #define TYPE_NPCM7XX_SMBUS "npcm7xx-smbus" -#define NPCM7XX_SMBUS(obj) OBJECT_CHECK(NPCM7xxSMBusState, (obj), \ - TYPE_NPCM7XX_SMBUS) +OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxSMBusState, NPCM7XX_SMBUS) =20 #endif /* NPCM7XX_SMBUS_H */ diff --git a/include/hw/misc/npcm7xx_clk.h b/include/hw/misc/npcm7xx_clk.h index d5c8d16ca4..5ed4a4672b 100644 --- a/include/hw/misc/npcm7xx_clk.h +++ b/include/hw/misc/npcm7xx_clk.h @@ -175,6 +175,6 @@ struct NPCM7xxCLKState { }; =20 #define TYPE_NPCM7XX_CLK "npcm7xx-clk" -#define NPCM7XX_CLK(obj) OBJECT_CHECK(NPCM7xxCLKState, (obj), TYPE_NPCM7XX= _CLK) +OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxCLKState, NPCM7XX_CLK) =20 #endif /* NPCM7XX_CLK_H */ diff --git a/include/hw/misc/npcm7xx_gcr.h b/include/hw/misc/npcm7xx_gcr.h index 9419e0a7d2..c0bbdda77e 100644 --- a/include/hw/misc/npcm7xx_gcr.h +++ b/include/hw/misc/npcm7xx_gcr.h @@ -55,7 +55,7 @@ */ #define NPCM7XX_GCR_NR_REGS (0x148 / sizeof(uint32_t)) =20 -typedef struct NPCM7xxGCRState { +struct NPCM7xxGCRState { SysBusDevice parent; =20 MemoryRegion iomem; @@ -65,9 +65,9 @@ typedef struct NPCM7xxGCRState { uint32_t reset_pwron; uint32_t reset_mdlr; uint32_t reset_intcr3; -} NPCM7xxGCRState; +}; =20 #define TYPE_NPCM7XX_GCR "npcm7xx-gcr" -#define NPCM7XX_GCR(obj) OBJECT_CHECK(NPCM7xxGCRState, (obj), TYPE_NPCM7XX= _GCR) +OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxGCRState, NPCM7XX_GCR) =20 #endif /* NPCM7XX_GCR_H */ diff --git a/include/hw/misc/npcm7xx_mft.h b/include/hw/misc/npcm7xx_mft.h index 36785e3ba8..d6384382ce 100644 --- a/include/hw/misc/npcm7xx_mft.h +++ b/include/hw/misc/npcm7xx_mft.h @@ -49,7 +49,7 @@ * @max_rpm: The maximum rpm for fans. Order: A0, B0, A1, B1. * @duty: The duty cycles for fans, relative to NPCM7XX_PWM_MAX_DUTY. */ -typedef struct NPCM7xxMFTState { +struct NPCM7xxMFTState { SysBusDevice parent; =20 MemoryRegion iomem; @@ -61,10 +61,9 @@ typedef struct NPCM7xxMFTState { =20 uint32_t max_rpm[NPCM7XX_MFT_FANIN_COUNT]; uint32_t duty[NPCM7XX_MFT_FANIN_COUNT]; -} NPCM7xxMFTState; +}; =20 #define TYPE_NPCM7XX_MFT "npcm7xx-mft" -#define NPCM7XX_MFT(obj) \ - OBJECT_CHECK(NPCM7xxMFTState, (obj), TYPE_NPCM7XX_MFT) +OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxMFTState, NPCM7XX_MFT) =20 #endif /* NPCM7XX_MFT_H */ diff --git a/include/hw/misc/npcm7xx_pwm.h b/include/hw/misc/npcm7xx_pwm.h index 7ad632a93a..bf953440ac 100644 --- a/include/hw/misc/npcm7xx_pwm.h +++ b/include/hw/misc/npcm7xx_pwm.h @@ -101,7 +101,6 @@ struct NPCM7xxPWMState { }; =20 #define TYPE_NPCM7XX_PWM "npcm7xx-pwm" -#define NPCM7XX_PWM(obj) \ - OBJECT_CHECK(NPCM7xxPWMState, (obj), TYPE_NPCM7XX_PWM) +OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxPWMState, NPCM7XX_PWM) =20 #endif /* NPCM7XX_PWM_H */ diff --git a/include/hw/misc/npcm7xx_rng.h b/include/hw/misc/npcm7xx_rng.h index 5e85fd439d..650375dc2c 100644 --- a/include/hw/misc/npcm7xx_rng.h +++ b/include/hw/misc/npcm7xx_rng.h @@ -18,7 +18,7 @@ =20 #include "hw/sysbus.h" =20 -typedef struct NPCM7xxRNGState { +struct NPCM7xxRNGState { SysBusDevice parent; =20 MemoryRegion iomem; @@ -26,9 +26,9 @@ typedef struct NPCM7xxRNGState { uint8_t rngcs; uint8_t rngd; uint8_t rngmode; -} NPCM7xxRNGState; +}; =20 #define TYPE_NPCM7XX_RNG "npcm7xx-rng" -#define NPCM7XX_RNG(obj) OBJECT_CHECK(NPCM7xxRNGState, (obj), TYPE_NPCM7XX= _RNG) +OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxRNGState, NPCM7XX_RNG) =20 #endif /* NPCM7XX_RNG_H */ diff --git a/include/hw/net/npcm7xx_emc.h b/include/hw/net/npcm7xx_emc.h index eac7f29816..b789007160 100644 --- a/include/hw/net/npcm7xx_emc.h +++ b/include/hw/net/npcm7xx_emc.h @@ -277,10 +277,7 @@ struct NPCM7xxEMCState { bool rx_active; }; =20 -typedef struct NPCM7xxEMCState NPCM7xxEMCState; - #define TYPE_NPCM7XX_EMC "npcm7xx-emc" -#define NPCM7XX_EMC(obj) \ - OBJECT_CHECK(NPCM7xxEMCState, (obj), TYPE_NPCM7XX_EMC) +OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxEMCState, NPCM7XX_EMC) =20 #endif /* NPCM7XX_EMC_H */ diff --git a/include/hw/sd/npcm7xx_sdhci.h b/include/hw/sd/npcm7xx_sdhci.h index d728f0a40d..ad8002f766 100644 --- a/include/hw/sd/npcm7xx_sdhci.h +++ b/include/hw/sd/npcm7xx_sdhci.h @@ -51,7 +51,7 @@ typedef struct NPCM7xxRegs { uint32_t boottoctrl; } NPCM7xxRegisters; =20 -typedef struct NPCM7xxSDHCIState { +struct NPCM7xxSDHCIState { SysBusDevice parent; =20 MemoryRegion container; @@ -60,6 +60,6 @@ typedef struct NPCM7xxSDHCIState { NPCM7xxRegisters regs; =20 SDHCIState sdhci; -} NPCM7xxSDHCIState; +}; =20 #endif /* NPCM7XX_SDHCI_H */ --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673273992; cv=none; d=zohomail.com; s=zohoarc; b=M7z7DDn1DStj6guQWjWCBQrRL5cL0nCbFLfnUjAUETaWWkqptthb5OSWwCZ0eWzrvrDcT0EEh2dPR1PM7/XCRU6xoHdQWgcNyMloQmOtsB755p8/+NOaNU+Omvq1SboDDgpWxrrUWTWMVVjIXDxECBOLYgO2zKqM6qcVk4CfNVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673273992; h=Content-Type:Content-Transfer-Encoding:Cc: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=QlHQBOjSmhQVd2SMP2d1A4sh6JcfbzBv9sZkKRmApVc=; b=PPV71QtX9uPAHizwXVG2H71F1DeFnDPxGvBgIrSj6jnWTW93tSmsoiuWJn0zCCIAHCSTEKkMdIgFxFl0Js6faobf1YGi48eV81Yjg4TSp8nXlRUP0qI4WvkxprB3HPwqM7BAv3LS6FNKw3gnTsdCEqNx73q7KOyUA0Cw0ykyc+Q= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167327399202551.77782845043055; Mon, 9 Jan 2023 06:19:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEslE-0001so-Ma; Mon, 09 Jan 2023 09:04:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEskw-0001ld-Ns for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:12 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEsku-0006ye-QL for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:06 -0500 Received: by mail-wm1-x32b.google.com with SMTP id p1-20020a05600c1d8100b003d8c9b191e0so6841680wms.4 for ; Mon, 09 Jan 2023 06:04:04 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id r16-20020a05600c35d000b003d2157627a8sm17083837wmq.47.2023.01.09.06.04.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:04:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QlHQBOjSmhQVd2SMP2d1A4sh6JcfbzBv9sZkKRmApVc=; b=xW74q+C9PemYkd7uAK1OOa6A2bRIzPARJsdG2ZYm/Ng8/zQN4hKyDn2y64Y4aMkkTy vZN7CamorCv8a/gdg0RNyWGErnsk7azIUsbFSS9CPcr4gU/vJhGWtp9ECvHLByMPB5Qi 74PGpVB+QIUe7KDHnCcl7uoow1dlAaIfaRQMskhhG0ocuVr181Fq83mBWWQX70z4rZTB msm8qgzh7rs6N7me27uM6u8yd8cWXM+mReBSRUeReaNJBdpGlIcFG+CHK6gYuBYpB4tw 57AiuZ86hSiIT+Zsn0xnQ2YYg4oVzU+yjIYPOps9DoxqhVrQdl9gIbCYImObkwtCwmA5 vF6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QlHQBOjSmhQVd2SMP2d1A4sh6JcfbzBv9sZkKRmApVc=; b=bV1f0zsWOoGBoDkxcfmrztGQFTyuIY7b60t4uVtG/HRUvBKPoLB+GxRsnZQFvucvYq YnTsMk49DzFlff2Xf84+r2x7ZVrsImBUsazxFmUS2McMNd920Tbq0d0G57FGZWasOzcV R9mNpCuif235baCVHlc5HbiPqGzCPEJ3aiaOVQFLrjIfu9WURtCFvF5DePL+blndo1P3 S7i00RGDCfaatc51FpugQms7yrvEN7YRxF1LR1tvlvNvcWUGkNDrVDJ6Q36/SiZOpjmX bmBfvso9YYYT62tnYGfELX/92zdK68uYve1I6iDxXuuD/eWAazM74x16CcqZuGi3EA5e S2tQ== X-Gm-Message-State: AFqh2kq1UdGJO4POQ4zak0GaJT1/FyLYTZ7b0n7KPZa0GCukm/6hy5mm F1pADyhYEYzvl2KEk93Ox9+oMVRQTQ4jQN6s X-Google-Smtp-Source: AMrXdXvyjDHuauJGP8Jhi651MsMyTAK4SJEWDIMwUZbSt2i5g6bKAxfLl6WfMn9Ow0XNEZvI4Th83w== X-Received: by 2002:a05:600c:47d1:b0:3d3:496b:de9d with SMTP id l17-20020a05600c47d100b003d3496bde9dmr46557159wmo.34.1673273043307; Mon, 09 Jan 2023 06:04:03 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 11/14] hw/misc/sbsa_ec: Rename TYPE_SBSA_EC -> TYPE_SBSA_SECURE_EC Date: Mon, 9 Jan 2023 15:03:03 +0100 Message-Id: <20230109140306.23161-12-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673273994359100003 The structure is named SECUREECState. Rename the type accordingly. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/misc/sbsa_ec.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c index 8d939fe31b..6f19c21195 100644 --- a/hw/misc/sbsa_ec.c +++ b/hw/misc/sbsa_ec.c @@ -15,13 +15,14 @@ #include "hw/sysbus.h" #include "sysemu/runstate.h" =20 -typedef struct { +typedef struct SECUREECState { SysBusDevice parent_obj; MemoryRegion iomem; } SECUREECState; =20 -#define TYPE_SBSA_EC "sbsa-ec" -#define SECURE_EC(obj) OBJECT_CHECK(SECUREECState, (obj), TYPE_SBSA_EC) +#define TYPE_SBSA_SECURE_EC "sbsa-ec" +#define SBSA_SECURE_EC(obj) \ + OBJECT_CHECK(SECUREECState, (obj), TYPE_SBSA_SECURE_EC) =20 enum sbsa_ec_powerstates { SBSA_EC_CMD_POWEROFF =3D 0x01, @@ -36,7 +37,7 @@ static uint64_t sbsa_ec_read(void *opaque, hwaddr offset,= unsigned size) } =20 static void sbsa_ec_write(void *opaque, hwaddr offset, - uint64_t value, unsigned size) + uint64_t value, unsigned size) { if (offset =3D=3D 0) { /* PSCI machine power command register */ switch (value) { @@ -65,7 +66,7 @@ static const MemoryRegionOps sbsa_ec_ops =3D { =20 static void sbsa_ec_init(Object *obj) { - SECUREECState *s =3D SECURE_EC(obj); + SECUREECState *s =3D SBSA_SECURE_EC(obj); SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 memory_region_init_io(&s->iomem, obj, &sbsa_ec_ops, s, "sbsa-ec", @@ -82,7 +83,7 @@ static void sbsa_ec_class_init(ObjectClass *klass, void *= data) } =20 static const TypeInfo sbsa_ec_info =3D { - .name =3D TYPE_SBSA_EC, + .name =3D TYPE_SBSA_SECURE_EC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(SECUREECState), .instance_init =3D sbsa_ec_init, --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673277433; cv=none; d=zohomail.com; s=zohoarc; b=gMYryOhTr9JCWeCBRFVW6y0MPb2UaAsKtbSptfesAgXI4qhC2hnE8zDkFIr3vZws+CWjT2BBiG6ZzeDNM+IDjbf/Kpi7yf7nYpfGukXrID9S0mMiPTFtRjqNY0pJWbooiEkXa1m8CkLdWpq0QSyvKq9l39gxwUw9hAO43xtarM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673277433; h=Content-Type:Content-Transfer-Encoding:Cc: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=7BFQYTotXMIsrw/hyKX+oi+c+rZBE8f8yezrJmKudvs=; b=bHp/NwRa7aGWp9+QAdLyFKlQp3nywkCG9nWY/j+jtkextICA4WQgmSKhp37OMz0FgccIe0WYR2WrMPgGB/X3Pg10O14EtIReqpkw3FV7QidxUkwGyyRxDJ22JNNFs/VQNdu68OcUap/es65qv79f6ZemK7PTDZEK+Cyg2SAfv5E= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673277433245406.1920714128877; Mon, 9 Jan 2023 07:17:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEslC-0001qV-Ke; Mon, 09 Jan 2023 09:04:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEsl3-0001ml-7X for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:13 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEskz-00075e-Np for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:11 -0500 Received: by mail-wm1-x32c.google.com with SMTP id ay40so6346058wmb.2 for ; Mon, 09 Jan 2023 06:04:09 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id h15-20020a05600c314f00b003d99469ece1sm17126842wmo.24.2023.01.09.06.04.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:04:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7BFQYTotXMIsrw/hyKX+oi+c+rZBE8f8yezrJmKudvs=; b=X0Lve+yN2jV2HlrkcE0RiLBXetXm5XbVn/pIRfzyp5PEoxSgfn+Z1EJyezUwse8F2R zX8WgUuVM296gZSqJb3SxLK2xDjv0aQnKjm+cUXWKTgiyaTB7RDVreDMCf+iuHswCQGx EpKdqKzZcmglNXA0KQMXD2CXzMGOtYhsgGw68BDh2kc4ePoK5tvasKuaY6O/p1QWhS3Y s1Izai2Xsz8CBp9XpLvnsjqjPmiMY1b4P83BA1FJXLIX5jOwDXRAS/L+Z3djoSkLwrpY NeUslyD1we7hObvLTdk+yiv8Hpm8El1H7tlq8p1YVcAVZm0a2i7gYIsQYwEf3WgUT89I 9LCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7BFQYTotXMIsrw/hyKX+oi+c+rZBE8f8yezrJmKudvs=; b=LAlJk8CWQrzkYUTWL4uLA8c0ROIaZJxi2vrkiCURMsMj0RBlCsWzfwu7kmBIxQMq78 dLmhUpn6YUaX+uveZJBwwUCABQypHPbiyhWLfObtAgSCd9+t515o7lmisP5Owf90+rx5 kWLEEQydY8t0g+8Uue9jpOXIusgvL1oSFO3J2eVicnSEVCEQStM/rA/h9YeslkU25T5W 47oPWWagDd0swWH42JljXKIAo4R+Io//OWcZwHmUj4XrUFOIf+6a7Oehd2AFxRLJxmPl itkl52jIXrMwwOHzUEUhx9t/i7vvneo01cA+kaB4pxkd92XnvbdyYLV91mMSvwyTNDJO K/jg== X-Gm-Message-State: AFqh2koCdislPzMQbuJJlw4M7HUBg/i4yPV6XQaqviqIzCmH5be18J6V /r9PkAV6adFuGw+8srIYy5WUaVUkQR546q0M X-Google-Smtp-Source: AMrXdXvKszs6jcVWRU/R1xY5ui4nm5WPCU4lPooCn/xcOx2UeVXag85mtjzULNuuYL1GLIyW3vo8xw== X-Received: by 2002:a05:600c:5024:b0:3d3:55ad:a114 with SMTP id n36-20020a05600c502400b003d355ada114mr46999823wmr.38.1673273048229; Mon, 09 Jan 2023 06:04:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 12/14] hw/misc/sbsa_ec: Declare QOM macros using OBJECT_DECLARE_SIMPLE_TYPE() Date: Mon, 9 Jan 2023 15:03:04 +0100 Message-Id: <20230109140306.23161-13-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673277433944100001 This model was merged few days before the QOM cleanup from commit 8063396bf3 ("Use OBJECT_DECLARE_SIMPLE_TYPE when possible") was pulled and merged. Manually adapt. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/misc/sbsa_ec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c index 6f19c21195..86b23a5372 100644 --- a/hw/misc/sbsa_ec.c +++ b/hw/misc/sbsa_ec.c @@ -21,8 +21,7 @@ typedef struct SECUREECState { } SECUREECState; =20 #define TYPE_SBSA_SECURE_EC "sbsa-ec" -#define SBSA_SECURE_EC(obj) \ - OBJECT_CHECK(SECUREECState, (obj), TYPE_SBSA_SECURE_EC) +OBJECT_DECLARE_SIMPLE_TYPE(SECUREECState, SBSA_SECURE_EC) =20 enum sbsa_ec_powerstates { SBSA_EC_CMD_POWEROFF =3D 0x01, --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673278393; cv=none; d=zohomail.com; s=zohoarc; b=KcizwiEx52YU7XfH87yT0ZTnm2nslGBotUirlQ76vuaAh5ROB6E43O+cOypR1/ztS9WxnyfgydtAC/CgfjzUAO4++Z+QfhpwFsAymH+CM2iDlrtE52Z/FVEVJLxAK60ZjnCtcc1h7ytAxXtemRYS7fq7msXxXGSs7WvCigLjEAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673278393; h=Content-Type:Content-Transfer-Encoding:Cc: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=2gvdf7MKgAqOkpgoECI87U6UIVZrGkUaGXJayKsJqzE=; b=nZrSihKCgTuq1N7ms9ktOwoNTA2B38XIYF74SeyGIlqnL+zM4Ov/atf/VKSu2eAtDA+1aQgx+ZND047hXVgZX5pASvwFslZ/yMMAfqcyw3LOSx6Jvu2+nm0F+q9SX26Serr9ABLmvc5UhGBaaoYTWmb0czZJyCUMZcUoWLFPZ/I= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673278393504331.57099607603016; Mon, 9 Jan 2023 07:33:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEslR-0001zW-Q9; Mon, 09 Jan 2023 09:04:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEslA-0001sB-Tf for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:22 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEsl4-00075e-67 for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:19 -0500 Received: by mail-wm1-x32c.google.com with SMTP id ay40so6346304wmb.2 for ; Mon, 09 Jan 2023 06:04:13 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id fc14-20020a05600c524e00b003a3442f1229sm18134541wmb.29.2023.01.09.06.04.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:04:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2gvdf7MKgAqOkpgoECI87U6UIVZrGkUaGXJayKsJqzE=; b=xvoG6pZO1tl/N0GOiWKJDNz4VIn0BW/rIN6xl/jJwGwJPmX4hkRbbG1FojLhjg4ziQ WA0JWvl3Bcwp8gctRtDvitDN4B+WQVPGMTC+lgEqpVU/yn6CSJ/hUGf4qdES22U5UdNF Pgcuy+9VtHs5v5l2PooPedXvagnOXcBw8eyPPrtUmYCvBs6hdSY5XrjjeKrBUHnpPPhG A6Fzif7Xk64vwrjbq9WXgsLjPpcv/uwtEXhGMlVBAU8cv+OAQDJWUO3f/xvWDTEWYG0I grgVeMu6IZosom+gC0uDJ5N1RMulZku2SZNlBkfhrJEIoYnxwnbrFOJKxVHdHnaT+9FZ mDKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2gvdf7MKgAqOkpgoECI87U6UIVZrGkUaGXJayKsJqzE=; b=SZ1d/bw6wK0PPqoKyEz+PPof940X2892dEJBk6T5iRQmOSynxalVg+/rK7hb+fVMJB 2OLqb/20YC7tydjEGSpzwZzZNEzDDipHtjTmzdnfEwVecs9MXqbKGmyDXOgouAOOjI+3 FtxlNnY66KAnDPd+UwR/UXl9c9tPcb1MyrQmed97HusD6Iolr6/eBDfR6LGgjE2/dLuL no/JoNL2dXXBS/Fvw2bRb569GNnLQ1G2fjSO6LwFtRCucTHmE9ZljL/JH0Tk3UtQFJBj xvElbq+7EnRokG52htCvrPqEbkAcqjvTtC+A6FSxCikGnGERBcmB0slZF6CeuJJM4Qrx t4DA== X-Gm-Message-State: AFqh2koGR0oV5viu6If/ZP5dhPQMp2EB35FgxGcNL2/na87oHOhGtFm9 J7pKupHPZrnaXKpeF2Iij/nDRKixOgQLlVHx X-Google-Smtp-Source: AMrXdXvrDxn7UYpq+gUIs5Ez0UFHr8I9lCRb4bkBmc/xjPlYy8OIlGq0aIjOGC7cd+mHe5Tuj6sqJw== X-Received: by 2002:a05:600c:539a:b0:3d9:efe8:a424 with SMTP id hg26-20020a05600c539a00b003d9efe8a424mr2516127wmb.34.1673273053181; Mon, 09 Jan 2023 06:04:13 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 13/14] hw/intc/xilinx_intc: Use 'XpsIntc' typedef instead of 'struct xlx_pic' Date: Mon, 9 Jan 2023 15:03:05 +0100 Message-Id: <20230109140306.23161-14-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673278394292100005 This remove a use of 'struct' in the DECLARE_INSTANCE_CHECKER() macro call, to avoid after a QOM refactor: hw/intc/xilinx_intc.c:45:1: error: declaration of anonymous struct must b= e a definition DECLARE_INSTANCE_CHECKER(struct xlx_pic, XILINX_INTC, ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Edgar E. Iglesias Reviewed-by: Richard Henderson --- hw/intc/xilinx_intc.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c index 4c4397b3d2..6e5012e66e 100644 --- a/hw/intc/xilinx_intc.c +++ b/hw/intc/xilinx_intc.c @@ -42,10 +42,10 @@ #define R_MAX 8 =20 #define TYPE_XILINX_INTC "xlnx.xps-intc" -DECLARE_INSTANCE_CHECKER(struct xlx_pic, XILINX_INTC, - TYPE_XILINX_INTC) +typedef struct XpsIntc XpsIntc; +DECLARE_INSTANCE_CHECKER(XpsIntc, XILINX_INTC, TYPE_XILINX_INTC) =20 -struct xlx_pic +struct XpsIntc { SysBusDevice parent_obj; =20 @@ -62,7 +62,7 @@ struct xlx_pic uint32_t irq_pin_state; }; =20 -static void update_irq(struct xlx_pic *p) +static void update_irq(XpsIntc *p) { uint32_t i; =20 @@ -87,10 +87,9 @@ static void update_irq(struct xlx_pic *p) qemu_set_irq(p->parent_irq, (p->regs[R_MER] & 1) && p->regs[R_IPR]); } =20 -static uint64_t -pic_read(void *opaque, hwaddr addr, unsigned int size) +static uint64_t pic_read(void *opaque, hwaddr addr, unsigned int size) { - struct xlx_pic *p =3D opaque; + XpsIntc *p =3D opaque; uint32_t r =3D 0; =20 addr >>=3D 2; @@ -106,11 +105,10 @@ pic_read(void *opaque, hwaddr addr, unsigned int size) return r; } =20 -static void -pic_write(void *opaque, hwaddr addr, - uint64_t val64, unsigned int size) +static void pic_write(void *opaque, hwaddr addr, + uint64_t val64, unsigned int size) { - struct xlx_pic *p =3D opaque; + XpsIntc *p =3D opaque; uint32_t value =3D val64; =20 addr >>=3D 2; @@ -154,7 +152,7 @@ static const MemoryRegionOps pic_ops =3D { =20 static void irq_handler(void *opaque, int irq, int level) { - struct xlx_pic *p =3D opaque; + XpsIntc *p =3D opaque; =20 /* edge triggered interrupt */ if (p->c_kind_of_intr & (1 << irq) && p->regs[R_MER] & 2) { @@ -168,7 +166,7 @@ static void irq_handler(void *opaque, int irq, int leve= l) =20 static void xilinx_intc_init(Object *obj) { - struct xlx_pic *p =3D XILINX_INTC(obj); + XpsIntc *p =3D XILINX_INTC(obj); =20 qdev_init_gpio_in(DEVICE(obj), irq_handler, 32); sysbus_init_irq(SYS_BUS_DEVICE(obj), &p->parent_irq); @@ -179,7 +177,7 @@ static void xilinx_intc_init(Object *obj) } =20 static Property xilinx_intc_properties[] =3D { - DEFINE_PROP_UINT32("kind-of-intr", struct xlx_pic, c_kind_of_intr, 0), + DEFINE_PROP_UINT32("kind-of-intr", XpsIntc, c_kind_of_intr, 0), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -193,7 +191,7 @@ static void xilinx_intc_class_init(ObjectClass *klass, = void *data) static const TypeInfo xilinx_intc_info =3D { .name =3D TYPE_XILINX_INTC, .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(struct xlx_pic), + .instance_size =3D sizeof(XpsIntc), .instance_init =3D xilinx_intc_init, .class_init =3D xilinx_intc_class_init, }; --=20 2.38.1 From nobody Sun May 19 10:38:42 2024 Delivered-To: importer@patchew.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=1673278333; cv=none; d=zohomail.com; s=zohoarc; b=k0ZWfL7IMkLwvJJZEnDbiYQSHKi/hI0F7dtF+lLZHnu39UU5xjwUv7n/C0If+iEH08DKews+7SBnpxk/WMk5RwtxXRZW8qQIxEYajtU3IovcfS8SKxgr1mzgeq07NGwzXDxAijcL9ZIxcxi/rhu2ekcouH7tFbO7jiBL0E9psqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673278333; h=Content-Type:Content-Transfer-Encoding:Cc: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=WrR1GDMObTllDPwJtD3Of+jW/9BkqqN5WyyEeN1uJKY=; b=Nk5pDk7A5fOpYR61Dmi1+R8tK2ujwHjgAwFvDK1Tjss7TWHmPW3wwvvZK6BFI+GvmmgsAsceT1fg2Giffb8/X5F1MrtZeZswZUFdGgJcUmf6+jbUvKH48nquiUDDzpHVmG5zYk9mhbU4NBLXmdhVQedckw9Db80sNSwey+QylPw= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1673278333068250.10192575375754; Mon, 9 Jan 2023 07:32:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEslR-0001zC-01; Mon, 09 Jan 2023 09:04:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEslE-0001tE-0j for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:24 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEslA-0007Fv-MP for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:23 -0500 Received: by mail-wm1-x335.google.com with SMTP id i17-20020a05600c355100b003d99434b1cfso6859934wmq.1 for ; Mon, 09 Jan 2023 06:04:19 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id o19-20020a05600c339300b003cff309807esm15064539wmp.23.2023.01.09.06.04.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:04:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WrR1GDMObTllDPwJtD3Of+jW/9BkqqN5WyyEeN1uJKY=; b=iOZ+uxN5jCKG7I/DUWcF6QaCuPpV14kq9LNDH7pB/h2nPr8ZNwh5h9M9a2USyhvQiI q+nGXUiUKan1D7a/RatyCvAlAPp4zH8fuhUt3g9R1vVGC+cWCIIG363Ja6YFd9fzBzgJ xJJN3Ef5A6K45/R79amUCbOkD4wlWUrFd/tjz2+iLAkdxccpNsHWVjL1oWCH/b1WaYxH 6ZCYlxq6bftJvSO8TV5fCnVMRczNcueSoZM+MauthPn5d7siI0Fe+grXiXf9bfrUEW9J wsXvi8NsTdpPyTrGOYhdp/HqBXtyD05EycNT6gX+lITCzXC4ejnLUSOhciazLYEbvqNo iKEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WrR1GDMObTllDPwJtD3Of+jW/9BkqqN5WyyEeN1uJKY=; b=Hz/Sq8OPQ4ZS/cSGOF09iHiFBHc36YWurGK38odrzhj0Ga2oPdcxeM8/9ikn1L/TZU QIcPZhtVCMdZHhllh/Wy74Ax2s2xY2WVqpHIY4oHW5Tdxm8Obs1egkhoUBMnn6191vfE xduqYkzJfyM9F0Z2nXWyjw3drTjNEA3UAfbnIhIBRDsEIcYoyiW/pqkd7/3nZcJGW/iF q+SFrVO6bNCyDtz2TiCHNGv0WXeI1AeTcz9JW58ATWxCjFnDHgMmsieLiFZpiuPsasRd tYqbNAZAss4lLpXdzuMLsMPedbXNu0ZPEro0nZAT7Uv6xBSDPQq1JrEP3qTnjAYjwr78 dWdQ== X-Gm-Message-State: AFqh2ko1tV8oLlm/6Qj/XJKc/mMTqgi2tJZg2XaEVvm2ktfRiMURPI3P WCTXcRC1C5iyfNgXQykzIQkYLHZ9qbPP5F4A X-Google-Smtp-Source: AMrXdXuaDwPJrvoha9f5KjblbefxTgp5WRSb2sQ3b/JhocV1mkVdPBs9eMj6KzJmI9sF9f5vbEE0vw== X-Received: by 2002:a05:600c:348b:b0:3d2:2a72:2577 with SMTP id a11-20020a05600c348b00b003d22a722577mr45551835wmq.27.1673273058111; Mon, 09 Jan 2023 06:04:18 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 14/14] hw/timer/xilinx_timer: Use XpsTimerState instead of 'struct timerblock' Date: Mon, 9 Jan 2023 15:03:06 +0100 Message-Id: <20230109140306.23161-15-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1673278335074100001 This remove a use of 'struct' in the DECLARE_INSTANCE_CHECKER() macro call, to avoid after a QOM refactor: hw/timer/xilinx_timer.c:65:1: error: declaration of anonymous struct must= be a definition DECLARE_INSTANCE_CHECKER(struct timerblock, XILINX_TIMER, ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Edgar E. Iglesias Reviewed-by: Richard Henderson --- hw/timer/xilinx_timer.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index c7f17cd646..32a9df69e0 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -62,10 +62,10 @@ struct xlx_timer }; =20 #define TYPE_XILINX_TIMER "xlnx.xps-timer" -DECLARE_INSTANCE_CHECKER(struct timerblock, XILINX_TIMER, - TYPE_XILINX_TIMER) +typedef struct XpsTimerState XpsTimerState; +DECLARE_INSTANCE_CHECKER(XpsTimerState, XILINX_TIMER, TYPE_XILINX_TIMER) =20 -struct timerblock +struct XpsTimerState { SysBusDevice parent_obj; =20 @@ -76,7 +76,7 @@ struct timerblock struct xlx_timer *timers; }; =20 -static inline unsigned int num_timers(struct timerblock *t) +static inline unsigned int num_timers(XpsTimerState *t) { return 2 - t->one_timer_only; } @@ -87,7 +87,7 @@ static inline unsigned int timer_from_addr(hwaddr addr) return addr >> 2; } =20 -static void timer_update_irq(struct timerblock *t) +static void timer_update_irq(XpsTimerState *t) { unsigned int i, irq =3D 0; uint32_t csr; @@ -104,7 +104,7 @@ static void timer_update_irq(struct timerblock *t) static uint64_t timer_read(void *opaque, hwaddr addr, unsigned int size) { - struct timerblock *t =3D opaque; + XpsTimerState *t =3D opaque; struct xlx_timer *xt; uint32_t r =3D 0; unsigned int timer; @@ -155,7 +155,7 @@ static void timer_write(void *opaque, hwaddr addr, uint64_t val64, unsigned int size) { - struct timerblock *t =3D opaque; + XpsTimerState *t =3D opaque; struct xlx_timer *xt; unsigned int timer; uint32_t value =3D val64; @@ -202,7 +202,7 @@ static const MemoryRegionOps timer_ops =3D { static void timer_hit(void *opaque) { struct xlx_timer *xt =3D opaque; - struct timerblock *t =3D xt->parent; + XpsTimerState *t =3D xt->parent; D(fprintf(stderr, "%s %d\n", __func__, xt->nr)); xt->regs[R_TCSR] |=3D TCSR_TINT; =20 @@ -213,7 +213,7 @@ static void timer_hit(void *opaque) =20 static void xilinx_timer_realize(DeviceState *dev, Error **errp) { - struct timerblock *t =3D XILINX_TIMER(dev); + XpsTimerState *t =3D XILINX_TIMER(dev); unsigned int i; =20 /* Init all the ptimers. */ @@ -236,16 +236,15 @@ static void xilinx_timer_realize(DeviceState *dev, Er= ror **errp) =20 static void xilinx_timer_init(Object *obj) { - struct timerblock *t =3D XILINX_TIMER(obj); + XpsTimerState *t =3D XILINX_TIMER(obj); =20 /* All timers share a single irq line. */ sysbus_init_irq(SYS_BUS_DEVICE(obj), &t->irq); } =20 static Property xilinx_timer_properties[] =3D { - DEFINE_PROP_UINT32("clock-frequency", struct timerblock, freq_hz, - 62 * 10000= 00), - DEFINE_PROP_UINT8("one-timer-only", struct timerblock, one_timer_only,= 0), + DEFINE_PROP_UINT32("clock-frequency", XpsTimerState, freq_hz, 62 * 100= 0000), + DEFINE_PROP_UINT8("one-timer-only", XpsTimerState, one_timer_only, 0), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -260,7 +259,7 @@ static void xilinx_timer_class_init(ObjectClass *klass,= void *data) static const TypeInfo xilinx_timer_info =3D { .name =3D TYPE_XILINX_TIMER, .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(struct timerblock), + .instance_size =3D sizeof(XpsTimerState), .instance_init =3D xilinx_timer_init, .class_init =3D xilinx_timer_class_init, }; --=20 2.38.1