From patchwork Fri Jan 13 14:11:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 641982 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp264085pvb; Fri, 13 Jan 2023 07:23:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXvvDGTqcv0JQ+SqoQZAQmB097gW/HN9q2UNdBUU59WxbTf+tmz2B6lQuhFys1IFxbO107I1 X-Received: by 2002:ad4:5109:0:b0:532:de3:9b70 with SMTP id g9-20020ad45109000000b005320de39b70mr47504839qvp.3.1673623416986; Fri, 13 Jan 2023 07:23:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673623416; cv=none; d=google.com; s=arc-20160816; b=y4V5Vcg/j3hEk3t/HYlWCI76qcSODdFe8nAZkYyaKixfHpbgxYy6BpoapitjpCocds mG+A0EFf6oy+eNzhGNMmeHFDXP/QH2hh7ooYe/ZwLPt2ESN6Xf7wdv23YwMU5YemI1XW qLvkXwwn9vQn8zzKqxM+bArI7xTeo0iQRtzpBgZAcK51ppsXuQ2VwufWKm27kSIYner/ etu+w2h0iQr8Jx0xMsLFFmlTZkxtz1u0832Gi6tyKLVKYvajtXUMpdVLPWAZTSZO8Adx tF81XRC8x9xsspOGlmD3QgxHF93SwZLELFZOHoCDqiEIX0yfvqHKa7UiMPmFQ+f91EVe EqiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=q7Emin5LoBOaXo/950Rc6TydbfuLbLjEQel5QAMzT6A=; b=t6Z2CFJwP+UxozhCa2K0XRFBdN2/c5AeLoBtqWs0dFwJnmUEcEhrC4ak8SHng2CLjQ VYhpWPKvAQLdNPyRNsETYBAUUpEkxAC5L2p7OWCIqQ7vBrlYXjuOgEhk8IBxqG6nshCm p1/4skvNPievs7KRH0dYMOekVewun+QfkDk8ULwRuqHT2HInBEsXtQdDXosT1N4hZBnX 74GJI0j90wY1OwUvtdd6k5CkCFH7p3r5fR5Mul9h4FiCQ2lySt+EUXzQhoLidZf/1Mvg xAh09UfOeVUzPwcZ6v8urvXXbLY/slnAow8Ka30Ku04f5rsgh/A0UhI/K+5qyiQO/D2f oAfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mEuXM2hc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 3-20020a0562140cc300b00531ccabdd60si13482578qvx.389.2023.01.13.07.23.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jan 2023 07:23:36 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mEuXM2hc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGKnI-0001VP-HU; Fri, 13 Jan 2023 09:12:32 -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 1pGKml-00012r-LR for qemu-devel@nongnu.org; Fri, 13 Jan 2023 09:11:59 -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 1pGKmh-0003ev-90 for qemu-devel@nongnu.org; Fri, 13 Jan 2023 09:11:59 -0500 Received: by mail-wm1-x32b.google.com with SMTP id o15so15343644wmr.4 for ; Fri, 13 Jan 2023 06:11: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:to:from:from:to:cc:subject:date:message-id :reply-to; bh=q7Emin5LoBOaXo/950Rc6TydbfuLbLjEQel5QAMzT6A=; b=mEuXM2hct2dEW5utDYoRtPTqEuWsT9sH9phsJtBzs8FLdQPs8kzWwMw5jF2SmZBydW M86ZBxCMUW/KaJjAsXL0wNe7WiasEqfGnOMsJjXlU42/n9THAFhfjVi4nJntWXfFXUMD 6h0Tmwq78oneu4elrTu1atiQQ8qhOOGgjzIhAefXLL2fC/NnI2JyjWHi/tC33UrNPQy1 hDOErl6BzHJ1TUBm7IhQJMnZdRsg+ihd0fIZBAG/CiKS3w4TG+NtbEiO2CoeFdYoKOSz rhLC/2CH6aI6rUs/IlHjR3MDz1fQhHS/nT2hfnFxP00SXId260NmW1Vcl6rkd1pOMTs0 EeiA== 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q7Emin5LoBOaXo/950Rc6TydbfuLbLjEQel5QAMzT6A=; b=tSAH3WgqpJTXUwh5EimMUEXpa68FbdHZCMMXYf2i2qDiMsZ1yMy65zbZS6hnWAm/dr 6HlCAznmzvouD8z6PO9DBpE3zfcDbU51KkGilW7FiC5mCZDt4ucaw3+Kotroas8bwCul jtHpW9JNYtxg4oj0Sa6gPxMHFVw1JyPV+S6mCvk3/mbEexOpXptB7kHdcXqrtQScO5x2 aGZUHs+oDhtwmKm/0Av+IDYe/ik2dvFIa1TJ4UoJAHTdE/odBW3y3tkhul2YDD2HUyYu CUdiOqlPENVhUtshObZ16GnsM2qIhdQe0r2U+eCC0+erNp3JoWP4htyxEhzDPC7+ib04 dv/w== X-Gm-Message-State: AFqh2kql9fBAFQRcb8++y5zr64VwNA2J5nFKg7c9854aFCbt776LEtZZ U2oC4IMaxIebaN7S3b54EPd/BRnjgxvL41dy X-Received: by 2002:a1c:6a16:0:b0:3c6:f732:bf6f with SMTP id f22-20020a1c6a16000000b003c6f732bf6fmr58470016wmc.13.1673619108534; Fri, 13 Jan 2023 06:11:48 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n36-20020a05600c502400b003da0b75de94sm5334464wmr.8.2023.01.13.06.11.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 06:11:48 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 24/38] hw/arm/pxa: Avoid forward-declaring PXA2xxI2CState Date: Fri, 13 Jan 2023 14:11:12 +0000 Message-Id: <20230113141126.535646-25-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113141126.535646-1-peter.maydell@linaro.org> References: <20230113141126.535646-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé To avoid forward-declaring PXA2xxI2CState, declare PXA2XX_I2C before its use in pxa2xx_i2c_init() prototype. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20230109140306.23161-2-philmd@linaro.org Signed-off-by: Peter Maydell --- 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 ba8f49e48ed..54eb895e42a 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); /* 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); -#define TYPE_PXA2XX_I2C "pxa2xx_i2c" typedef struct PXA2xxI2SState PXA2xxI2SState; -OBJECT_DECLARE_SIMPLE_TYPE(PXA2xxI2CState, PXA2XX_I2C) #define TYPE_PXA2XX_FIR "pxa2xx-fir" OBJECT_DECLARE_SIMPLE_TYPE(PXA2xxFIrState, PXA2XX_FIR)