From: Rob Herring <robh@kernel.org> To: soc@kernel.org, Li Yang <leoyang.li@nxp.com>, Qiang Zhao <qiang.zhao@nxp.com> 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 [thread overview] Message-ID: <20230724205551.768767-1-robh@kernel.org> (raw) 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 <robh@kernel.org> --- 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 <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/of_address.h> #include <linux/miscdevice.h> +#include <linux/platform_device.h> #include <linux/uaccess.h> #include <linux/slab.h> #include <linux/fs.h> 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 <linux/iopoll.h> #include <linux/crc32.h> #include <linux/mod_devicetable.h> -#include <linux/of_platform.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <soc/fsl/qe/immap_qe.h> #include <soc/fsl/qe/qe.h> 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 <linux/genalloc.h> #include <linux/init.h> #include <linux/list.h> -#include <linux/of_device.h> #include <linux/spinlock.h> #include <linux/export.h> #include <linux/of.h> 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 <linux/io.h> #include <linux/kernel.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <soc/fsl/qe/qe_tdm.h> static int set_tdm_framer(const char *tdm_framer_type) -- 2.40.1
WARNING: multiple messages have this Message-ID (diff)
From: Rob Herring <robh@kernel.org> To: soc@kernel.org, Li Yang <leoyang.li@nxp.com>, Qiang Zhao <qiang.zhao@nxp.com> Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] soc: fsl: Explicitly include correct DT includes Date: Mon, 24 Jul 2023 14:55:51 -0600 [thread overview] Message-ID: <20230724205551.768767-1-robh@kernel.org> (raw) 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 <robh@kernel.org> --- 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 <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/of_address.h> #include <linux/miscdevice.h> +#include <linux/platform_device.h> #include <linux/uaccess.h> #include <linux/slab.h> #include <linux/fs.h> 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 <linux/iopoll.h> #include <linux/crc32.h> #include <linux/mod_devicetable.h> -#include <linux/of_platform.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <soc/fsl/qe/immap_qe.h> #include <soc/fsl/qe/qe.h> 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 <linux/genalloc.h> #include <linux/init.h> #include <linux/list.h> -#include <linux/of_device.h> #include <linux/spinlock.h> #include <linux/export.h> #include <linux/of.h> 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 <linux/io.h> #include <linux/kernel.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <soc/fsl/qe/qe_tdm.h> static int set_tdm_framer(const char *tdm_framer_type) -- 2.40.1
next reply other threads:[~2023-07-24 20:55 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-07-24 20:55 Rob Herring [this message] 2023-07-24 20:55 ` [PATCH v2] soc: fsl: Explicitly include correct DT includes Rob Herring 2023-08-12 9:14 ` patchwork-bot+linux-soc
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230724205551.768767-1-robh@kernel.org \ --to=robh@kernel.org \ --cc=leoyang.li@nxp.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=qiang.zhao@nxp.com \ --cc=soc@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.