From patchwork Mon Jul 24 20:55:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13325326 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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EF2F4C001DE for ; Mon, 24 Jul 2023 20:55:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id 93D11C433C7; Mon, 24 Jul 2023 20:55:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0476DC433C8; Mon, 24 Jul 2023 20:55:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690232157; bh=sj1kweh2LpsGQOuIcSQfoiRzu3VVJ8qGje7Q06bYrI8=; h=From:List-Id:To:Cc:Subject:Date:From; b=CbrcTxIG7fZgkh/q4lnmrf/sk2/DyMjd0fD3k1uiiIkDRdTDcES0ew1WyhqJUkGjj 1iBbTvlOReHmmQ3ypuXZW+qDGxwV0HUknxMI3vaD+mz011tGowe6JiqaoCe3Jc4tWS /NX6kCpDxfjrnuaHyns5xiwe6JKd0wb7SDi3HYF3VDl2yKuVQpRbirYzYj9iOtD0GP Cg3KATDESJe+VpGTPFurgzUq2z6ikbV2qICmS03xkULxRp6U1ve1UvNU2morIKMMyM ffd3JU0YRLdJP8jlgLxj6CvT4n6gasvftttUt/mOTyMjyfB9IOH1Lezkq8IU1OuNgl uy/jIqRz6DvXg== Received: (nullmailer pid 768905 invoked by uid 1000); Mon, 24 Jul 2023 20:55:55 -0000 From: Rob Herring List-Id: To: soc@kernel.org, Li Yang , Qiang Zhao Cc: linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] soc: fsl: Explicitly include correct DT includes Date: Mon, 24 Jul 2023 14:55:51 -0600 Message-Id: <20230724205551.768767-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 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 --- v2: - Add qe.c --- drivers/soc/fsl/dpaa2-console.c | 3 ++- drivers/soc/fsl/qe/qe.c | 3 ++- drivers/soc/fsl/qe/qe_common.c | 1 - drivers/soc/fsl/qe/qe_tdm.c | 4 +--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/soc/fsl/dpaa2-console.c b/drivers/soc/fsl/dpaa2-console.c index 53917410f2bd..1dca693b6b38 100644 --- a/drivers/soc/fsl/dpaa2-console.c +++ b/drivers/soc/fsl/dpaa2-console.c @@ -9,9 +9,10 @@ #define pr_fmt(fmt) "dpaa2-console: " fmt #include -#include +#include #include #include +#include #include #include #include diff --git a/drivers/soc/fsl/qe/qe.c b/drivers/soc/fsl/qe/qe.c index b3c226eb5292..95168b574627 100644 --- a/drivers/soc/fsl/qe/qe.c +++ b/drivers/soc/fsl/qe/qe.c @@ -25,7 +25,8 @@ #include #include #include -#include +#include +#include #include #include diff --git a/drivers/soc/fsl/qe/qe_common.c b/drivers/soc/fsl/qe/qe_common.c index a0cb8e746879..9729ce86db59 100644 --- a/drivers/soc/fsl/qe/qe_common.c +++ b/drivers/soc/fsl/qe/qe_common.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/soc/fsl/qe/qe_tdm.c b/drivers/soc/fsl/qe/qe_tdm.c index 7d7d78d3ee50..a3b691875c8e 100644 --- a/drivers/soc/fsl/qe/qe_tdm.c +++ b/drivers/soc/fsl/qe/qe_tdm.c @@ -9,9 +9,7 @@ */ #include #include -#include -#include -#include +#include #include static int set_tdm_framer(const char *tdm_framer_type)