tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

net: ipa: more include file cleanup

All of the config data files and all of the register definition
files (plus a few others) use GSI_EE_AP, which is defined in
"ipa_version.h". Include that header where it's needed.

All of the IPA register definition files include "../ipa.h", though
none of them need anything defined there. Similarly, all of the GSI
register definition files include "../gsi.h", but don't need anything
defined there. Remove these unnneded includes.

All of the configuration data files include "../gsi.h", though none
of them need anything defined there, so remove these includes.

Remove other includes of local header files that are not required.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

authored by

Alex Elder and committed by
Paolo Abeni f60e5fb6 11606196

+35 -40
+1 -1
drivers/net/ipa/data/ipa_data-v3.1.c
··· 7 7 #include <linux/array_size.h> 8 8 #include <linux/log2.h> 9 9 10 - #include "../gsi.h" 11 10 #include "../ipa_data.h" 12 11 #include "../ipa_endpoint.h" 13 12 #include "../ipa_mem.h" 13 + #include "../ipa_version.h" 14 14 15 15 /** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.1 */ 16 16 enum ipa_resource_type {
+1 -1
drivers/net/ipa/data/ipa_data-v3.5.1.c
··· 7 7 #include <linux/array_size.h> 8 8 #include <linux/log2.h> 9 9 10 - #include "../gsi.h" 11 10 #include "../ipa_data.h" 12 11 #include "../ipa_endpoint.h" 13 12 #include "../ipa_mem.h" 13 + #include "../ipa_version.h" 14 14 15 15 /** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.5.1 */ 16 16 enum ipa_resource_type {
+1 -1
drivers/net/ipa/data/ipa_data-v4.11.c
··· 5 5 #include <linux/array_size.h> 6 6 #include <linux/log2.h> 7 7 8 - #include "../gsi.h" 9 8 #include "../ipa_data.h" 10 9 #include "../ipa_endpoint.h" 11 10 #include "../ipa_mem.h" 11 + #include "../ipa_version.h" 12 12 13 13 /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.11 */ 14 14 enum ipa_resource_type {
+1 -1
drivers/net/ipa/data/ipa_data-v4.2.c
··· 5 5 #include <linux/array_size.h> 6 6 #include <linux/log2.h> 7 7 8 - #include "../gsi.h" 9 8 #include "../ipa_data.h" 10 9 #include "../ipa_endpoint.h" 11 10 #include "../ipa_mem.h" 11 + #include "../ipa_version.h" 12 12 13 13 /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.2 */ 14 14 enum ipa_resource_type {
+1 -1
drivers/net/ipa/data/ipa_data-v4.5.c
··· 5 5 #include <linux/array_size.h> 6 6 #include <linux/log2.h> 7 7 8 - #include "../gsi.h" 9 8 #include "../ipa_data.h" 10 9 #include "../ipa_endpoint.h" 11 10 #include "../ipa_mem.h" 11 + #include "../ipa_version.h" 12 12 13 13 /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.5 */ 14 14 enum ipa_resource_type {
+1 -1
drivers/net/ipa/data/ipa_data-v4.7.c
··· 5 5 #include <linux/array_size.h> 6 6 #include <linux/log2.h> 7 7 8 - #include "../gsi.h" 9 8 #include "../ipa_data.h" 10 9 #include "../ipa_endpoint.h" 11 10 #include "../ipa_mem.h" 11 + #include "../ipa_version.h" 12 12 13 13 /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.7 */ 14 14 enum ipa_resource_type {
+1 -1
drivers/net/ipa/data/ipa_data-v4.9.c
··· 5 5 #include <linux/array_size.h> 6 6 #include <linux/log2.h> 7 7 8 - #include "../gsi.h" 9 8 #include "../ipa_data.h" 10 9 #include "../ipa_endpoint.h" 11 10 #include "../ipa_mem.h" 11 + #include "../ipa_version.h" 12 12 13 13 /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.9 */ 14 14 enum ipa_resource_type {
+1 -1
drivers/net/ipa/data/ipa_data-v5.0.c
··· 5 5 #include <linux/array_size.h> 6 6 #include <linux/log2.h> 7 7 8 - #include "../gsi.h" 9 8 #include "../ipa_data.h" 10 9 #include "../ipa_endpoint.h" 11 10 #include "../ipa_mem.h" 11 + #include "../ipa_version.h" 12 12 13 13 /** enum ipa_resource_type - IPA resource types for an SoC having IPA v5.0 */ 14 14 enum ipa_resource_type {
+1 -1
drivers/net/ipa/data/ipa_data-v5.5.c
··· 3 3 /* Copyright (C) 2023-2024 Linaro Ltd. */ 4 4 5 5 #include <linux/array_size.h> 6 - #include <linux/kernel.h> 7 6 #include <linux/log2.h> 8 7 9 8 #include "../ipa_data.h" 10 9 #include "../ipa_endpoint.h" 11 10 #include "../ipa_mem.h" 11 + #include "../ipa_version.h" 12 12 13 13 /** enum ipa_resource_type - IPA resource types for an SoC having IPA v5.5 */ 14 14 enum ipa_resource_type {
+1
drivers/net/ipa/ipa_endpoint.c
··· 24 24 #include "ipa_gsi.h" 25 25 #include "ipa_power.h" 26 26 #include "ipa_interrupt.h" 27 + #include "ipa_version.h" 27 28 28 29 /* Hardware is told about receive buffers once a "batch" has been queued */ 29 30 #define IPA_REPLENISH_BATCH 16 /* Must be non-zero */
+1 -1
drivers/net/ipa/ipa_endpoint.h
··· 9 9 #include <linux/types.h> 10 10 #include <linux/workqueue.h> 11 11 12 - #include "gsi.h" 13 12 #include "ipa_reg.h" 13 + #include "ipa_version.h" 14 14 15 15 struct net_device; 16 16 struct sk_buff;
+1
drivers/net/ipa/ipa_gsi.c
··· 11 11 #include "ipa.h" 12 12 #include "ipa_endpoint.h" 13 13 #include "ipa_data.h" 14 + #include "ipa_version.h" 14 15 15 16 void ipa_gsi_trans_complete(struct gsi_trans *trans) 16 17 {
+1 -1
drivers/net/ipa/ipa_main.c
··· 29 29 #include "ipa_modem.h" 30 30 #include "ipa_uc.h" 31 31 #include "ipa_interrupt.h" 32 - #include "gsi_trans.h" 33 32 #include "ipa_sysfs.h" 33 + #include "ipa_version.h" 34 34 35 35 /** 36 36 * DOC: The IP Accelerator
-3
drivers/net/ipa/ipa_modem.c
··· 15 15 #include <linux/remoteproc/qcom_rproc.h> 16 16 17 17 #include "ipa.h" 18 - #include "ipa_data.h" 19 18 #include "ipa_endpoint.h" 20 19 #include "ipa_table.h" 21 20 #include "ipa_mem.h" 22 21 #include "ipa_modem.h" 23 22 #include "ipa_smp2p.h" 24 - #include "ipa_qmi.h" 25 23 #include "ipa_uc.h" 26 - #include "ipa_power.h" 27 24 28 25 #define IPA_NETDEV_NAME "rmnet_ipa%d" 29 26 #define IPA_NETDEV_TAILROOM 0 /* for padding by mux layer */
-2
drivers/net/ipa/ipa_qmi.c
··· 9 9 #include <linux/qrtr.h> 10 10 11 11 #include "ipa.h" 12 - #include "ipa_endpoint.h" 13 12 #include "ipa_mem.h" 14 - #include "ipa_table.h" 15 13 #include "ipa_modem.h" 16 14 #include "ipa_qmi_msg.h" 17 15
-1
drivers/net/ipa/ipa_reg.h
··· 6 6 #ifndef _IPA_REG_H_ 7 7 #define _IPA_REG_H_ 8 8 9 - #include "ipa_version.h" 10 9 #include "reg.h" 11 10 12 11 struct platform_device;
+2 -2
drivers/net/ipa/reg/gsi_reg-v3.1.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../gsi.h" 10 - #include "../reg.h" 11 9 #include "../gsi_reg.h" 10 + #include "../ipa_version.h" 11 + #include "../reg.h" 12 12 13 13 REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, 14 14 0x0000c020 + 0x1000 * GSI_EE_AP);
+2 -2
drivers/net/ipa/reg/gsi_reg-v3.5.1.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../gsi.h" 10 - #include "../reg.h" 11 9 #include "../gsi_reg.h" 10 + #include "../ipa_version.h" 11 + #include "../reg.h" 12 12 13 13 REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, 14 14 0x0000c020 + 0x1000 * GSI_EE_AP);
+2 -2
drivers/net/ipa/reg/gsi_reg-v4.0.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../gsi.h" 10 - #include "../reg.h" 11 9 #include "../gsi_reg.h" 10 + #include "../ipa_version.h" 11 + #include "../reg.h" 12 12 13 13 REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, 14 14 0x0000c020 + 0x1000 * GSI_EE_AP);
+2 -2
drivers/net/ipa/reg/gsi_reg-v4.11.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../gsi.h" 10 - #include "../reg.h" 11 9 #include "../gsi_reg.h" 10 + #include "../ipa_version.h" 11 + #include "../reg.h" 12 12 13 13 REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, 14 14 0x0000c020 + 0x1000 * GSI_EE_AP);
+2 -2
drivers/net/ipa/reg/gsi_reg-v4.5.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../gsi.h" 10 - #include "../reg.h" 11 9 #include "../gsi_reg.h" 10 + #include "../ipa_version.h" 11 + #include "../reg.h" 12 12 13 13 REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, 14 14 0x0000c020 + 0x1000 * GSI_EE_AP);
+2 -2
drivers/net/ipa/reg/gsi_reg-v4.9.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../gsi.h" 10 - #include "../reg.h" 11 9 #include "../gsi_reg.h" 10 + #include "../ipa_version.h" 11 + #include "../reg.h" 12 12 13 13 REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, 14 14 0x0000c020 + 0x1000 * GSI_EE_AP);
+2 -2
drivers/net/ipa/reg/gsi_reg-v5.0.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../gsi.h" 10 - #include "../reg.h" 11 9 #include "../gsi_reg.h" 10 + #include "../ipa_version.h" 11 + #include "../reg.h" 12 12 13 13 REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, 14 14 0x0000c01c + 0x1000 * GSI_EE_AP);
+1 -1
drivers/net/ipa/reg/ipa_reg-v3.1.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../ipa.h" 10 9 #include "../ipa_reg.h" 10 + #include "../ipa_version.h" 11 11 12 12 static const u32 reg_comp_cfg_fmask[] = { 13 13 [COMP_CFG_ENABLE] = BIT(0),
+1 -1
drivers/net/ipa/reg/ipa_reg-v3.5.1.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../ipa.h" 10 9 #include "../ipa_reg.h" 10 + #include "../ipa_version.h" 11 11 12 12 static const u32 reg_comp_cfg_fmask[] = { 13 13 [COMP_CFG_ENABLE] = BIT(0),
+1 -1
drivers/net/ipa/reg/ipa_reg-v4.11.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../ipa.h" 10 9 #include "../ipa_reg.h" 10 + #include "../ipa_version.h" 11 11 12 12 static const u32 reg_comp_cfg_fmask[] = { 13 13 [RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS] = BIT(0),
+1 -1
drivers/net/ipa/reg/ipa_reg-v4.2.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../ipa.h" 10 9 #include "../ipa_reg.h" 10 + #include "../ipa_version.h" 11 11 12 12 static const u32 reg_comp_cfg_fmask[] = { 13 13 /* Bit 0 reserved */
+1 -1
drivers/net/ipa/reg/ipa_reg-v4.5.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../ipa.h" 10 9 #include "../ipa_reg.h" 10 + #include "../ipa_version.h" 11 11 12 12 static const u32 reg_comp_cfg_fmask[] = { 13 13 /* Bit 0 reserved */
+1 -1
drivers/net/ipa/reg/ipa_reg-v4.7.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../ipa.h" 10 9 #include "../ipa_reg.h" 10 + #include "../ipa_version.h" 11 11 12 12 static const u32 reg_comp_cfg_fmask[] = { 13 13 [RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS] = BIT(0),
+1 -1
drivers/net/ipa/reg/ipa_reg-v4.9.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../ipa.h" 10 9 #include "../ipa_reg.h" 10 + #include "../ipa_version.h" 11 11 12 12 static const u32 reg_comp_cfg_fmask[] = { 13 13 [RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS] = BIT(0),
+1 -1
drivers/net/ipa/reg/ipa_reg-v5.0.c
··· 6 6 #include <linux/bits.h> 7 7 #include <linux/types.h> 8 8 9 - #include "../ipa.h" 10 9 #include "../ipa_reg.h" 10 + #include "../ipa_version.h" 11 11 12 12 static const u32 reg_flavor_0_fmask[] = { 13 13 [MAX_PIPES] = GENMASK(7, 0),
-1
drivers/net/ipa/reg/ipa_reg-v5.5.c
··· 4 4 5 5 #include <linux/array_size.h> 6 6 #include <linux/bits.h> 7 - #include <linux/kernel.h> 8 7 #include <linux/types.h> 9 8 10 9 #include "../ipa_reg.h"