From patchwork Fri Jul 14 17:49:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 702810 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9BE84EB64DC for ; Fri, 14 Jul 2023 17:53:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236501AbjGNRxJ (ORCPT ); Fri, 14 Jul 2023 13:53:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236558AbjGNRwv (ORCPT ); Fri, 14 Jul 2023 13:52:51 -0400 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF4DA3AA7; Fri, 14 Jul 2023 10:52:10 -0700 (PDT) Received: by mail-il1-x132.google.com with SMTP id e9e14a558f8ab-345f4a3ff76so9694305ab.2; Fri, 14 Jul 2023 10:52:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689357008; x=1691949008; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JTGowGQ+gnh0je21trugV/Og1PbGM9FG4W2OVva7pw0=; b=Ys4yjOcgt2qumz/dhRxxQfgYoebGIMOjiaQv299JXdxoGBiu63+ALwLCF189N16ISf Q3dN08BYAyrnsivcT/4GjMidJNE2eH4F4zb4r2IzVsff9m/jhFhdpqEAy05qh2Rc5hiB wRDsbwI9/frLRguHhlR5Q52FJfIsz42sgrcfei679pQllyitXjBDyS/yxYiJIz+eavu+ M3G+I4A7lxykU7z/S44gXZDQa3TYKg7hrKUcqbTFiKChCTX1+3d6QOiB5atVTyINg2PV RQG8M0E1ujlsjffJcciHG9rOMI11VVGeKrHPDDFXBco1CyQqXJW/fDMOxD7Kw4OJVMWi 5G2g== X-Gm-Message-State: ABy/qLZaGQwDMlGpc+aIyBQeDx9WS/2FAaB9T5g7ajNeySvAlRvpjxBz tJB1cjPS3OceQLDQGPNEhg== X-Google-Smtp-Source: APBJJlEhOhChoEvuUEdONUTP5S4YdsfARFzKRecNc/9FDDY+IbgGFDh0FTj4W3Ikt2N9GuNQT2V8ig== X-Received: by 2002:a92:d181:0:b0:346:3920:5df2 with SMTP id z1-20020a92d181000000b0034639205df2mr4814067ilz.21.1689357007895; Fri, 14 Jul 2023 10:50:07 -0700 (PDT) Received: from robh_at_kernel.org ([64.188.179.250]) by smtp.gmail.com with ESMTPSA id c4-20020a02a404000000b0042b3e04510asm2694786jal.98.2023.07.14.10.50.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 10:50:07 -0700 (PDT) Received: (nullmailer pid 4063785 invoked by uid 1000); Fri, 14 Jul 2023 17:49:41 -0000 From: Rob Herring To: Philipp Zabel , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Damien Le Moal , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Lars Povlsen , Steen Hegelund , Daniel Machon , UNGLinuxDriver@microchip.com, Conor Dooley , Daire McNamara , Andy Gross , Bjorn Andersson , Konrad Dybcio , Kunihiko Hayashi , Masami Hiramatsu , Michal Simek Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-arm-msm@vger.kernel.org Subject: [PATCH] reset: Explicitly include correct DT includes Date: Fri, 14 Jul 2023 11:49:37 -0600 Message-Id: <20230714174939.4063667-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. Signed-off-by: Rob Herring Reviewed-by: Damien Le Moal Acked-by: Steen Hegelund --- drivers/reset/hisilicon/hi6220_reset.c | 1 - drivers/reset/hisilicon/reset-hi3660.c | 2 +- drivers/reset/reset-imx7.c | 2 +- drivers/reset/reset-intel-gw.c | 2 +- drivers/reset/reset-k210.c | 1 - drivers/reset/reset-meson-audio-arb.c | 3 ++- drivers/reset/reset-meson.c | 1 - drivers/reset/reset-microchip-sparx5.c | 3 ++- drivers/reset/reset-mpfs.c | 1 + drivers/reset/reset-qcom-aoss.c | 2 +- drivers/reset/reset-qcom-pdc.c | 2 +- drivers/reset/reset-simple.c | 1 - drivers/reset/reset-uniphier-glue.c | 2 +- drivers/reset/reset-uniphier.c | 1 - drivers/reset/reset-zynqmp.c | 1 - 15 files changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c index 5ca145b64e63..8d1fce18ded7 100644 --- a/drivers/reset/hisilicon/hi6220_reset.c +++ b/drivers/reset/hisilicon/hi6220_reset.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/reset/hisilicon/reset-hi3660.c b/drivers/reset/hisilicon/reset-hi3660.c index 965f5ceba7d8..087f28e326ee 100644 --- a/drivers/reset/hisilicon/reset-hi3660.c +++ b/drivers/reset/hisilicon/reset-hi3660.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c index d2408725eb2c..dd01fe11c5cb 100644 --- a/drivers/reset/reset-imx7.c +++ b/drivers/reset/reset-imx7.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/drivers/reset/reset-intel-gw.c b/drivers/reset/reset-intel-gw.c index effc177db80a..a5a01388ae7f 100644 --- a/drivers/reset/reset-intel-gw.c +++ b/drivers/reset/reset-intel-gw.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/drivers/reset/reset-k210.c b/drivers/reset/reset-k210.c index 1b6e03522b40..b62a2fd44e4e 100644 --- a/drivers/reset/reset-k210.c +++ b/drivers/reset/reset-k210.c @@ -3,7 +3,6 @@ * Copyright (c) 2020 Western Digital Corporation or its affiliates. */ #include -#include #include #include #include diff --git a/drivers/reset/reset-meson-audio-arb.c b/drivers/reset/reset-meson-audio-arb.c index 6a3f6a6a3bbf..7e46dbc04998 100644 --- a/drivers/reset/reset-meson-audio-arb.c +++ b/drivers/reset/reset-meson-audio-arb.c @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include #include #include diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c index 13878ca2779d..89ac99789a3c 100644 --- a/drivers/reset/reset-meson.c +++ b/drivers/reset/reset-meson.c @@ -14,7 +14,6 @@ #include #include #include -#include #define BITS_PER_REG 32 diff --git a/drivers/reset/reset-microchip-sparx5.c b/drivers/reset/reset-microchip-sparx5.c index ead25942061d..636e85c388b0 100644 --- a/drivers/reset/reset-microchip-sparx5.c +++ b/drivers/reset/reset-microchip-sparx5.c @@ -7,9 +7,10 @@ * https://github.com/microchip-ung/sparx-5_reginfo */ #include -#include +#include #include #include +#include #include #include diff --git a/drivers/reset/reset-mpfs.c b/drivers/reset/reset-mpfs.c index e71ab73092ab..7f3fb2d472f4 100644 --- a/drivers/reset/reset-mpfs.c +++ b/drivers/reset/reset-mpfs.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/reset/reset-qcom-aoss.c b/drivers/reset/reset-qcom-aoss.c index 9333b923dda0..f52e90e36194 100644 --- a/drivers/reset/reset-qcom-aoss.c +++ b/drivers/reset/reset-qcom-aoss.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include struct qcom_aoss_reset_map { diff --git a/drivers/reset/reset-qcom-pdc.c b/drivers/reset/reset-qcom-pdc.c index f22bb49a4ac8..a3aae3f902e6 100644 --- a/drivers/reset/reset-qcom-pdc.c +++ b/drivers/reset/reset-qcom-pdc.c @@ -4,7 +4,7 @@ */ #include -#include +#include #include #include #include diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c index 361a68314265..7ea5adbf2097 100644 --- a/drivers/reset/reset-simple.c +++ b/drivers/reset/reset-simple.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/reset/reset-uniphier-glue.c b/drivers/reset/reset-uniphier-glue.c index 15abac9fc72c..38aa953855aa 100644 --- a/drivers/reset/reset-uniphier-glue.c +++ b/drivers/reset/reset-uniphier-glue.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c index ff7580f38056..79c43c204d46 100644 --- a/drivers/reset/reset-uniphier.c +++ b/drivers/reset/reset-uniphier.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/reset/reset-zynqmp.c b/drivers/reset/reset-zynqmp.c index 59dc0ff9af9e..f0f64ad3472b 100644 --- a/drivers/reset/reset-zynqmp.c +++ b/drivers/reset/reset-zynqmp.c @@ -9,7 +9,6 @@ #include #include #include -#include #define ZYNQMP_NR_RESETS (ZYNQMP_PM_RESET_END - ZYNQMP_PM_RESET_START) #define ZYNQMP_RESET_ID ZYNQMP_PM_RESET_START