From patchwork Fri Jul 14 17:44: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: 1807957 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4R2f5M2fN0z20bh for ; Sat, 15 Jul 2023 03:45:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235136AbjGNRp0 (ORCPT ); Fri, 14 Jul 2023 13:45:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235841AbjGNRp0 (ORCPT ); Fri, 14 Jul 2023 13:45:26 -0400 Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CB6B3AB6; Fri, 14 Jul 2023 10:44:52 -0700 (PDT) Received: by mail-io1-f54.google.com with SMTP id ca18e2360f4ac-7836164a08aso89046139f.1; Fri, 14 Jul 2023 10:44:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689356691; x=1691948691; 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=lbZU0XtXzjBRJilDOgmpVrKHFrnYrm31NTuN+kNT6Ao=; b=ILx7/Hcu2VIWm2FGtS9F0xIZQH5gtAU/Ik6adH3ZWZE6lrvhnLMhahBDTQWq/trSWg s6ea95wk7YC1DXN/r065BOEQQw+fA3ff3UsZRGaPNdeaXIOhDeaNyea9zh3mkzuzOWEo I7ECnOc2X2Lc/I4lrP60vlWMH3qAFt8XIMOd/8sdXQFilh6YP8RNKC7kmxEeXqnT6GhX pO921+HkhwwI3JGn7GLZIIqb3kfJPbbALT0yIzcBIf0Bv+VmkpIoW4u/jdXU4RaMnCz+ jXhCSzxpXLyhVmTYVL2ofoxJaGB2Cj0Wm8eR/+If5JZIgHuOG8mpHfB8mrqDPywvS2yB 8v5A== X-Gm-Message-State: ABy/qLbMFxdQ9y90zbNC/1peaaNaUpMsD1AyFWEIlBC4gP/WEWWLjidr aIkCN56th7SRKMDqdt8c6w== X-Google-Smtp-Source: APBJJlEneyYfkFVpPFyvX92A6HKtgdIQ1HejXqIhAvVOgzLjJuL+rrrd6jC8t5f8VdpG+Ms7XluKwg== X-Received: by 2002:a5e:a705:0:b0:786:e669:3059 with SMTP id b5-20020a5ea705000000b00786e6693059mr6292798iod.6.1689356691575; Fri, 14 Jul 2023 10:44:51 -0700 (PDT) Received: from robh_at_kernel.org ([64.188.179.250]) by smtp.gmail.com with ESMTPSA id q3-20020a6b7103000000b00786ff73252bsm2805680iog.10.2023.07.14.10.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 10:44:50 -0700 (PDT) Received: (nullmailer pid 4055095 invoked by uid 1000); Fri, 14 Jul 2023 17:44:48 -0000 From: Rob Herring To: Sudeep Holla , Cristian Marussi , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Matthias Brugger , AngeloGioacchino Del Regno , Florian Fainelli , Broadcom internal kernel review list , Dinh Nguyen , Thierry Reding , Jonathan Hunter , Michal Simek Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-tegra@vger.kernel.org Subject: [PATCH] firmware: Explicitly include correct DT includes Date: Fri, 14 Jul 2023 11:44:37 -0600 Message-Id: <20230714174438.4054854-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-tegra@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 Acked-by: Thierry Reding --- drivers/firmware/arm_scmi/driver.c | 4 ++-- drivers/firmware/imx/imx-dsp.c | 1 - drivers/firmware/imx/imx-scu-irq.c | 1 + drivers/firmware/imx/imx-scu.c | 1 + drivers/firmware/mtk-adsp-ipc.c | 1 - drivers/firmware/raspberrypi.c | 1 + drivers/firmware/scpi_pm_domain.c | 3 ++- drivers/firmware/stratix10-rsu.c | 1 - drivers/firmware/tegra/bpmp.c | 3 +-- drivers/firmware/xilinx/zynqmp.c | 1 + 10 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index b5957cc12fee..87383c05424b 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/drivers/firmware/imx/imx-dsp.c b/drivers/firmware/imx/imx-dsp.c index a6c06d7476c3..3dba590a2a95 100644 --- a/drivers/firmware/imx/imx-dsp.c +++ b/drivers/firmware/imx/imx-dsp.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include diff --git a/drivers/firmware/imx/imx-scu-irq.c b/drivers/firmware/imx/imx-scu-irq.c index d9dcc20945c6..a149537e0639 100644 --- a/drivers/firmware/imx/imx-scu-irq.c +++ b/drivers/firmware/imx/imx-scu-irq.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #define IMX_SC_IRQ_FUNC_ENABLE 1 diff --git a/drivers/firmware/imx/imx-scu.c b/drivers/firmware/imx/imx-scu.c index 47db49911e7b..2e5914f3a110 100644 --- a/drivers/firmware/imx/imx-scu.c +++ b/drivers/firmware/imx/imx-scu.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/drivers/firmware/mtk-adsp-ipc.c b/drivers/firmware/mtk-adsp-ipc.c index 3c071f814455..85e94ddc7204 100644 --- a/drivers/firmware/mtk-adsp-ipc.c +++ b/drivers/firmware/mtk-adsp-ipc.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c index c3bc29e0a488..f66efaa5196d 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/firmware/scpi_pm_domain.c b/drivers/firmware/scpi_pm_domain.c index 800673910b51..2231e6dd2070 100644 --- a/drivers/firmware/scpi_pm_domain.c +++ b/drivers/firmware/scpi_pm_domain.c @@ -8,7 +8,8 @@ #include #include #include -#include +#include +#include #include #include diff --git a/drivers/firmware/stratix10-rsu.c b/drivers/firmware/stratix10-rsu.c index e51c95f8d445..ab3074705380 100644 --- a/drivers/firmware/stratix10-rsu.c +++ b/drivers/firmware/stratix10-rsu.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c index 17bd3590aaa2..51d062e0c3f1 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c @@ -8,8 +8,7 @@ #include #include #include -#include -#include +#include #include #include #include diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c index f8c4eb2b43f8..eb9ad5ae393f 100644 --- a/drivers/firmware/xilinx/zynqmp.c +++ b/drivers/firmware/xilinx/zynqmp.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include