MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-05 13:25:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: ipa: more include file cleanup

Browse Source 
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>
This commit is contained in:
Alex Elder 2024-04-16 18:10:17 -05:00 committed by Paolo Abeni
parent 116061962d
commit f60e5fb6df
32 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ipa/data/ipa_data-v3.1.c
View File

@ -7,10 +7,10 @@
#include <linux/array_size.h> #include <linux/array_size.h>
#include <linux/log2.h> #include <linux/log2.h>
#include "../gsi.h"
#include "../ipa_data.h" #include "../ipa_data.h"
#include "../ipa_endpoint.h" #include "../ipa_endpoint.h"
#include "../ipa_mem.h" #include "../ipa_mem.h"
#include "../ipa_version.h"
/** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.1 */ /** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.1 */
enum ipa_resource_type { enum ipa_resource_type {

2
drivers/net/ipa/data/ipa_data-v3.5.1.c
View File

@ -7,10 +7,10 @@
#include <linux/array_size.h> #include <linux/array_size.h>
#include <linux/log2.h> #include <linux/log2.h>
#include "../gsi.h"
#include "../ipa_data.h" #include "../ipa_data.h"
#include "../ipa_endpoint.h" #include "../ipa_endpoint.h"
#include "../ipa_mem.h" #include "../ipa_mem.h"
#include "../ipa_version.h"
/** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.5.1 */ /** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.5.1 */
enum ipa_resource_type { enum ipa_resource_type {

2
drivers/net/ipa/data/ipa_data-v4.11.c
View File

@ -5,10 +5,10 @@
#include <linux/array_size.h> #include <linux/array_size.h>
#include <linux/log2.h> #include <linux/log2.h>
#include "../gsi.h"
#include "../ipa_data.h" #include "../ipa_data.h"
#include "../ipa_endpoint.h" #include "../ipa_endpoint.h"
#include "../ipa_mem.h" #include "../ipa_mem.h"
#include "../ipa_version.h"
/** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.11 */ /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.11 */
enum ipa_resource_type { enum ipa_resource_type {

2
drivers/net/ipa/data/ipa_data-v4.2.c
View File

@ -5,10 +5,10 @@
#include <linux/array_size.h> #include <linux/array_size.h>
#include <linux/log2.h> #include <linux/log2.h>
#include "../gsi.h"
#include "../ipa_data.h" #include "../ipa_data.h"
#include "../ipa_endpoint.h" #include "../ipa_endpoint.h"
#include "../ipa_mem.h" #include "../ipa_mem.h"
#include "../ipa_version.h"
/** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.2 */ /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.2 */
enum ipa_resource_type { enum ipa_resource_type {

2
drivers/net/ipa/data/ipa_data-v4.5.c
View File

@ -5,10 +5,10 @@
#include <linux/array_size.h> #include <linux/array_size.h>
#include <linux/log2.h> #include <linux/log2.h>
#include "../gsi.h"
#include "../ipa_data.h" #include "../ipa_data.h"
#include "../ipa_endpoint.h" #include "../ipa_endpoint.h"
#include "../ipa_mem.h" #include "../ipa_mem.h"
#include "../ipa_version.h"
/** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.5 */ /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.5 */
enum ipa_resource_type { enum ipa_resource_type {

2
drivers/net/ipa/data/ipa_data-v4.7.c
View File

@ -5,10 +5,10 @@
#include <linux/array_size.h> #include <linux/array_size.h>
#include <linux/log2.h> #include <linux/log2.h>
#include "../gsi.h"
#include "../ipa_data.h" #include "../ipa_data.h"
#include "../ipa_endpoint.h" #include "../ipa_endpoint.h"
#include "../ipa_mem.h" #include "../ipa_mem.h"
#include "../ipa_version.h"
/** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.7 */ /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.7 */
enum ipa_resource_type { enum ipa_resource_type {

2
drivers/net/ipa/data/ipa_data-v4.9.c
View File

@ -5,10 +5,10 @@
#include <linux/array_size.h> #include <linux/array_size.h>
#include <linux/log2.h> #include <linux/log2.h>
#include "../gsi.h"
#include "../ipa_data.h" #include "../ipa_data.h"
#include "../ipa_endpoint.h" #include "../ipa_endpoint.h"
#include "../ipa_mem.h" #include "../ipa_mem.h"
#include "../ipa_version.h"
/** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.9 */ /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.9 */
enum ipa_resource_type { enum ipa_resource_type {

2
drivers/net/ipa/data/ipa_data-v5.0.c
View File

@ -5,10 +5,10 @@
#include <linux/array_size.h> #include <linux/array_size.h>
#include <linux/log2.h> #include <linux/log2.h>
#include "../gsi.h"
#include "../ipa_data.h" #include "../ipa_data.h"
#include "../ipa_endpoint.h" #include "../ipa_endpoint.h"
#include "../ipa_mem.h" #include "../ipa_mem.h"
#include "../ipa_version.h"
/** enum ipa_resource_type - IPA resource types for an SoC having IPA v5.0 */ /** enum ipa_resource_type - IPA resource types for an SoC having IPA v5.0 */
enum ipa_resource_type { enum ipa_resource_type {

2
drivers/net/ipa/data/ipa_data-v5.5.c
View File

@ -3,12 +3,12 @@
/* Copyright (C) 2023-2024 Linaro Ltd. */ /* Copyright (C) 2023-2024 Linaro Ltd. */
#include <linux/array_size.h> #include <linux/array_size.h>
#include <linux/kernel.h>
#include <linux/log2.h> #include <linux/log2.h>
#include "../ipa_data.h" #include "../ipa_data.h"
#include "../ipa_endpoint.h" #include "../ipa_endpoint.h"
#include "../ipa_mem.h" #include "../ipa_mem.h"
#include "../ipa_version.h"
/** enum ipa_resource_type - IPA resource types for an SoC having IPA v5.5 */ /** enum ipa_resource_type - IPA resource types for an SoC having IPA v5.5 */
enum ipa_resource_type { enum ipa_resource_type {

1
drivers/net/ipa/ipa_endpoint.c
View File

@ -24,6 +24,7 @@
#include "ipa_gsi.h" #include "ipa_gsi.h"
#include "ipa_power.h" #include "ipa_power.h"
#include "ipa_interrupt.h" #include "ipa_interrupt.h"
#include "ipa_version.h"
/* Hardware is told about receive buffers once a "batch" has been queued */ /* Hardware is told about receive buffers once a "batch" has been queued */
#define IPA_REPLENISH_BATCH 16 /* Must be non-zero */ #define IPA_REPLENISH_BATCH 16 /* Must be non-zero */

2
drivers/net/ipa/ipa_endpoint.h
View File

@ -9,8 +9,8 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "gsi.h"
#include "ipa_reg.h" #include "ipa_reg.h"
#include "ipa_version.h"
struct net_device; struct net_device;
struct sk_buff; struct sk_buff;

1
drivers/net/ipa/ipa_gsi.c
View File

@ -11,6 +11,7 @@
#include "ipa.h" #include "ipa.h"
#include "ipa_endpoint.h" #include "ipa_endpoint.h"
#include "ipa_data.h" #include "ipa_data.h"
#include "ipa_version.h"
void ipa_gsi_trans_complete(struct gsi_trans *trans) void ipa_gsi_trans_complete(struct gsi_trans *trans)
{ {

2
drivers/net/ipa/ipa_main.c
View File

@ -29,8 +29,8 @@
#include "ipa_modem.h" #include "ipa_modem.h"
#include "ipa_uc.h" #include "ipa_uc.h"
#include "ipa_interrupt.h" #include "ipa_interrupt.h"
#include "gsi_trans.h"
#include "ipa_sysfs.h" #include "ipa_sysfs.h"
#include "ipa_version.h"
/** /**
* DOC: The IP Accelerator * DOC: The IP Accelerator

3
drivers/net/ipa/ipa_modem.c
View File

@ -15,15 +15,12 @@
#include <linux/remoteproc/qcom_rproc.h> #include <linux/remoteproc/qcom_rproc.h>
#include "ipa.h" #include "ipa.h"
#include "ipa_data.h"
#include "ipa_endpoint.h" #include "ipa_endpoint.h"
#include "ipa_table.h" #include "ipa_table.h"
#include "ipa_mem.h" #include "ipa_mem.h"
#include "ipa_modem.h" #include "ipa_modem.h"
#include "ipa_smp2p.h" #include "ipa_smp2p.h"
#include "ipa_qmi.h"
#include "ipa_uc.h" #include "ipa_uc.h"
#include "ipa_power.h"
#define IPA_NETDEV_NAME "rmnet_ipa%d" #define IPA_NETDEV_NAME "rmnet_ipa%d"
#define IPA_NETDEV_TAILROOM 0 /* for padding by mux layer */ #define IPA_NETDEV_TAILROOM 0 /* for padding by mux layer */

2
drivers/net/ipa/ipa_qmi.c
View File

@ -9,9 +9,7 @@
#include <linux/qrtr.h> #include <linux/qrtr.h>
#include "ipa.h" #include "ipa.h"
#include "ipa_endpoint.h"
#include "ipa_mem.h" #include "ipa_mem.h"
#include "ipa_table.h"
#include "ipa_modem.h" #include "ipa_modem.h"
#include "ipa_qmi_msg.h" #include "ipa_qmi_msg.h"

1
drivers/net/ipa/ipa_reg.h
View File

@ -6,7 +6,6 @@
#ifndef _IPA_REG_H_ #ifndef _IPA_REG_H_
#define _IPA_REG_H_ #define _IPA_REG_H_
#include "ipa_version.h"
#include "reg.h" #include "reg.h"
struct platform_device; struct platform_device;

4
drivers/net/ipa/reg/gsi_reg-v3.1.c
View File

@ -6,9 +6,9 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../gsi.h"
#include "../reg.h"
#include "../gsi_reg.h" #include "../gsi_reg.h"
#include "../ipa_version.h"
#include "../reg.h"
REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk,
0x0000c020 + 0x1000 * GSI_EE_AP); 0x0000c020 + 0x1000 * GSI_EE_AP);

4
drivers/net/ipa/reg/gsi_reg-v3.5.1.c
View File

@ -6,9 +6,9 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../gsi.h"
#include "../reg.h"
#include "../gsi_reg.h" #include "../gsi_reg.h"
#include "../ipa_version.h"
#include "../reg.h"
REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk,
0x0000c020 + 0x1000 * GSI_EE_AP); 0x0000c020 + 0x1000 * GSI_EE_AP);

4
drivers/net/ipa/reg/gsi_reg-v4.0.c
View File

@ -6,9 +6,9 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../gsi.h"
#include "../reg.h"
#include "../gsi_reg.h" #include "../gsi_reg.h"
#include "../ipa_version.h"
#include "../reg.h"
REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk,
0x0000c020 + 0x1000 * GSI_EE_AP); 0x0000c020 + 0x1000 * GSI_EE_AP);

4
drivers/net/ipa/reg/gsi_reg-v4.11.c
View File

@ -6,9 +6,9 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../gsi.h"
#include "../reg.h"
#include "../gsi_reg.h" #include "../gsi_reg.h"
#include "../ipa_version.h"
#include "../reg.h"
REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk,
0x0000c020 + 0x1000 * GSI_EE_AP); 0x0000c020 + 0x1000 * GSI_EE_AP);

4
drivers/net/ipa/reg/gsi_reg-v4.5.c
View File

@ -6,9 +6,9 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../gsi.h"
#include "../reg.h"
#include "../gsi_reg.h" #include "../gsi_reg.h"
#include "../ipa_version.h"
#include "../reg.h"
REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk,
0x0000c020 + 0x1000 * GSI_EE_AP); 0x0000c020 + 0x1000 * GSI_EE_AP);

4
drivers/net/ipa/reg/gsi_reg-v4.9.c
View File

@ -6,9 +6,9 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../gsi.h"
#include "../reg.h"
#include "../gsi_reg.h" #include "../gsi_reg.h"
#include "../ipa_version.h"
#include "../reg.h"
REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk,
0x0000c020 + 0x1000 * GSI_EE_AP); 0x0000c020 + 0x1000 * GSI_EE_AP);

4
drivers/net/ipa/reg/gsi_reg-v5.0.c
View File

@ -6,9 +6,9 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../gsi.h"
#include "../reg.h"
#include "../gsi_reg.h" #include "../gsi_reg.h"
#include "../ipa_version.h"
#include "../reg.h"
REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk, REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk,
0x0000c01c + 0x1000 * GSI_EE_AP); 0x0000c01c + 0x1000 * GSI_EE_AP);

2
drivers/net/ipa/reg/ipa_reg-v3.1.c
View File

@ -6,8 +6,8 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../ipa.h"
#include "../ipa_reg.h" #include "../ipa_reg.h"
#include "../ipa_version.h"
static const u32 reg_comp_cfg_fmask[] = { static const u32 reg_comp_cfg_fmask[] = {
[COMP_CFG_ENABLE] = BIT(0), [COMP_CFG_ENABLE] = BIT(0),

2
drivers/net/ipa/reg/ipa_reg-v3.5.1.c
View File

@ -6,8 +6,8 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../ipa.h"
#include "../ipa_reg.h" #include "../ipa_reg.h"
#include "../ipa_version.h"
static const u32 reg_comp_cfg_fmask[] = { static const u32 reg_comp_cfg_fmask[] = {
[COMP_CFG_ENABLE] = BIT(0), [COMP_CFG_ENABLE] = BIT(0),

2
drivers/net/ipa/reg/ipa_reg-v4.11.c
View File

@ -6,8 +6,8 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../ipa.h"
#include "../ipa_reg.h" #include "../ipa_reg.h"
#include "../ipa_version.h"
static const u32 reg_comp_cfg_fmask[] = { static const u32 reg_comp_cfg_fmask[] = {
[RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS] = BIT(0), [RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS] = BIT(0),

2
drivers/net/ipa/reg/ipa_reg-v4.2.c
View File

@ -6,8 +6,8 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../ipa.h"
#include "../ipa_reg.h" #include "../ipa_reg.h"
#include "../ipa_version.h"
static const u32 reg_comp_cfg_fmask[] = { static const u32 reg_comp_cfg_fmask[] = {
/* Bit 0 reserved */ /* Bit 0 reserved */

2
drivers/net/ipa/reg/ipa_reg-v4.5.c
View File

@ -6,8 +6,8 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../ipa.h"
#include "../ipa_reg.h" #include "../ipa_reg.h"
#include "../ipa_version.h"
static const u32 reg_comp_cfg_fmask[] = { static const u32 reg_comp_cfg_fmask[] = {
/* Bit 0 reserved */ /* Bit 0 reserved */

2
drivers/net/ipa/reg/ipa_reg-v4.7.c
View File

@ -6,8 +6,8 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../ipa.h"
#include "../ipa_reg.h" #include "../ipa_reg.h"
#include "../ipa_version.h"
static const u32 reg_comp_cfg_fmask[] = { static const u32 reg_comp_cfg_fmask[] = {
[RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS] = BIT(0), [RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS] = BIT(0),

2
drivers/net/ipa/reg/ipa_reg-v4.9.c
View File

@ -6,8 +6,8 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../ipa.h"
#include "../ipa_reg.h" #include "../ipa_reg.h"
#include "../ipa_version.h"
static const u32 reg_comp_cfg_fmask[] = { static const u32 reg_comp_cfg_fmask[] = {
[RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS] = BIT(0), [RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS] = BIT(0),

2
drivers/net/ipa/reg/ipa_reg-v5.0.c
View File

@ -6,8 +6,8 @@
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/types.h> #include <linux/types.h>
#include "../ipa.h"
#include "../ipa_reg.h" #include "../ipa_reg.h"
#include "../ipa_version.h"
static const u32 reg_flavor_0_fmask[] = { static const u32 reg_flavor_0_fmask[] = {
[MAX_PIPES] = GENMASK(7, 0), [MAX_PIPES] = GENMASK(7, 0),

1
drivers/net/ipa/reg/ipa_reg-v5.5.c
View File

@ -4,7 +4,6 @@
#include <linux/array_size.h> #include <linux/array_size.h>
#include <linux/bits.h> #include <linux/bits.h>
#include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include "../ipa_reg.h" #include "../ipa_reg.h"