From c7f16608d4dc629c4a0b7aaa2ec68d3d36120fe2 Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Tue, 17 Dec 2019 14:54:11 -0700 Subject: [PATCH] include: Fixup headers to pass KERNEL_HEADER_TEST Fix up a bunch of headers so that they pass KERNEL_HEADER_TEST to ensure that they are self-contained. Change-Id: Ic0dedbad91f70263452c9a809333fe93c8ee2266 Signed-off-by: Jordan Crouse --- include/linux/btpower.h | 2 ++ include/linux/input/qpnp-power-on.h | 1 + include/linux/io-pgtable-fast.h | 1 + include/linux/ipa_usb.h | 6 ++++++ include/linux/msm_gpi.h | 4 ++++ include/linux/pinctrl/qcom-pinctrl.h | 2 ++ include/linux/qpnp/qpnp-pbs.h | 4 ++++ include/linux/qpnp/qpnp-revid.h | 4 ++++ include/linux/sched/core_ctl.h | 4 ++++ include/linux/soc/qcom/pmic_glink.h | 3 +++ include/linux/spi/spi-msm-geni.h | 2 ++ include/linux/usb/ccid_desc.h | 2 ++ include/linux/usb/usb_qdss.h | 2 ++ include/net/cnss_nl.h | 2 ++ include/net/cnss_prealloc.h | 2 ++ include/net/cnss_utils.h | 4 ++++ include/net/rmnet_config.h | 2 ++ include/net/virt_wifi.h | 4 ++++ include/soc/qcom/lpm-stats.h | 3 +++ include/soc/qcom/lpm_levels.h | 4 ++++ include/soc/qcom/memory_dump.h | 1 + include/soc/qcom/minidump.h | 2 ++ include/soc/qcom/qseecom_scm.h | 2 ++ include/soc/qcom/service-locator.h | 4 ++++ include/soc/qcom/service-notifier.h | 5 +++++ include/trace/events/ion.h | 1 + 26 files changed, 73 insertions(+) diff --git a/include/linux/btpower.h b/include/linux/btpower.h index 1b0d06946f60..e68a53b6756b 100644 --- a/include/linux/btpower.h +++ b/include/linux/btpower.h @@ -6,6 +6,8 @@ #ifndef __LINUX_BLUETOOTH_POWER_H #define __LINUX_BLUETOOTH_POWER_H +#include + /* * voltage regulator information required for configuring the * bluetooth chipset diff --git a/include/linux/input/qpnp-power-on.h b/include/linux/input/qpnp-power-on.h index 0f5fa9e5ece5..5e4f39ac9298 100644 --- a/include/linux/input/qpnp-power-on.h +++ b/include/linux/input/qpnp-power-on.h @@ -9,6 +9,7 @@ #include #include +#include /** * enum pon_trigger_source: List of PON trigger sources diff --git a/include/linux/io-pgtable-fast.h b/include/linux/io-pgtable-fast.h index a5559c2c42da..7a94e4cd0bec 100644 --- a/include/linux/io-pgtable-fast.h +++ b/include/linux/io-pgtable-fast.h @@ -15,6 +15,7 @@ typedef u64 av8l_fast_iopte; struct io_pgtable_ops; +struct scatterlist; #ifdef CONFIG_IOMMU_IO_PGTABLE_FAST diff --git a/include/linux/ipa_usb.h b/include/linux/ipa_usb.h index 80f09285d5c2..479f04942397 100644 --- a/include/linux/ipa_usb.h +++ b/include/linux/ipa_usb.h @@ -6,6 +6,12 @@ #ifndef _IPA_USB_H_ #define _IPA_USB_H_ +#include +#include +#include +#include +#include + enum ipa_usb_teth_prot { IPA_USB_RNDIS = 0, IPA_USB_ECM = 1, diff --git a/include/linux/msm_gpi.h b/include/linux/msm_gpi.h index b048ac0f2d61..2003af21919a 100644 --- a/include/linux/msm_gpi.h +++ b/include/linux/msm_gpi.h @@ -6,6 +6,8 @@ #ifndef __MSM_GPI_H_ #define __MSM_GPI_H_ +#include + struct __packed msm_gpi_tre { u32 dword[4]; }; @@ -196,6 +198,8 @@ struct msm_gpi_cb { struct msm_gpi_error_log error_log; }; +struct dma_chan; + struct gpi_client_info { /* * memory for msm_gpi_cb is released after callback, clients shall diff --git a/include/linux/pinctrl/qcom-pinctrl.h b/include/linux/pinctrl/qcom-pinctrl.h index f14d63ca8556..a3629fb09802 100644 --- a/include/linux/pinctrl/qcom-pinctrl.h +++ b/include/linux/pinctrl/qcom-pinctrl.h @@ -6,6 +6,8 @@ #ifndef __LINUX_PINCTRL_MSM_H__ #define __LINUX_PINCTRL_MSM_H__ +#include + /* APIS to access qup_i3c registers */ int msm_qup_write(u32 mode, u32 val); int msm_qup_read(u32 mode); diff --git a/include/linux/qpnp/qpnp-pbs.h b/include/linux/qpnp/qpnp-pbs.h index 5d410c31b5f5..1fced241a9b9 100644 --- a/include/linux/qpnp/qpnp-pbs.h +++ b/include/linux/qpnp/qpnp-pbs.h @@ -6,6 +6,10 @@ #ifndef _QPNP_PBS_H #define _QPNP_PBS_H +#include + +struct device_node; + #if IS_ENABLED(CONFIG_QPNP_PBS) int qpnp_pbs_trigger_event(struct device_node *dev_node, u8 bitmap); #else diff --git a/include/linux/qpnp/qpnp-revid.h b/include/linux/qpnp/qpnp-revid.h index 35adbaa86efd..4f5f50fd42fa 100644 --- a/include/linux/qpnp/qpnp-revid.h +++ b/include/linux/qpnp/qpnp-revid.h @@ -6,6 +6,8 @@ #ifndef __QPNP_REVID #define __QPNP_REVID +#include + /* Common TYPE for all PMICs */ #define PMIC_TYPE 0x51 @@ -330,6 +332,8 @@ struct pmic_revid_data { int tp_rev; }; +struct device_node; + #if IS_ENABLED(CONFIG_QPNP_REVID) struct pmic_revid_data *get_revid_data(struct device_node *dev_node); #else diff --git a/include/linux/sched/core_ctl.h b/include/linux/sched/core_ctl.h index 20ba464c1170..83c742ddf549 100644 --- a/include/linux/sched/core_ctl.h +++ b/include/linux/sched/core_ctl.h @@ -6,6 +6,8 @@ #ifndef __CORE_CTL_H #define __CORE_CTL_H +#include + #define MAX_CPUS_PER_CLUSTER 6 #define MAX_CLUSTERS 3 @@ -16,6 +18,8 @@ struct core_ctl_notif_data { unsigned int cur_cap_pct[MAX_CLUSTERS]; }; +struct notifier_block; + #ifdef CONFIG_SCHED_WALT extern int __weak core_ctl_set_boost(bool boost); extern void __weak core_ctl_notifier_register(struct notifier_block *n); diff --git a/include/linux/soc/qcom/pmic_glink.h b/include/linux/soc/qcom/pmic_glink.h index 7839b3d207c1..fe3039b12f50 100644 --- a/include/linux/soc/qcom/pmic_glink.h +++ b/include/linux/soc/qcom/pmic_glink.h @@ -6,7 +6,10 @@ #ifndef _PMIC_GLINK_H #define _PMIC_GLINK_H +#include + struct pmic_glink_client; +struct device; /** * struct pmic_glink_client_data - pmic_glink client data diff --git a/include/linux/spi/spi-msm-geni.h b/include/linux/spi/spi-msm-geni.h index f305cb03b6fd..f86985470e8b 100644 --- a/include/linux/spi/spi-msm-geni.h +++ b/include/linux/spi/spi-msm-geni.h @@ -6,6 +6,8 @@ #ifndef __SPI_GENI_QCOM_HEADER___ #define __SPI_GENI_QCOM_HEADER___ +#include + struct spi_geni_qcom_ctrl_data { u32 spi_cs_clk_delay; u32 spi_inter_words_delay; diff --git a/include/linux/usb/ccid_desc.h b/include/linux/usb/ccid_desc.h index 50fbf6a43773..a826718532ee 100644 --- a/include/linux/usb/ccid_desc.h +++ b/include/linux/usb/ccid_desc.h @@ -6,6 +6,8 @@ #ifndef __LINUX_USB_CCID_DESC_H #define __LINUX_USB_CCID_DESC_H +#include + /*CCID specification version 1.10*/ #define CCID1_10 0x0110 diff --git a/include/linux/usb/usb_qdss.h b/include/linux/usb/usb_qdss.h index d42bd540286c..ce1667a661ef 100644 --- a/include/linux/usb/usb_qdss.h +++ b/include/linux/usb/usb_qdss.h @@ -6,6 +6,8 @@ #ifndef __LINUX_USB_QDSS_H #define __LINUX_USB_QDSS_H +#include +#include #include #define USB_QDSS_CH_MDM "qdss_mdm" diff --git a/include/net/cnss_nl.h b/include/net/cnss_nl.h index 5afe37e73c24..b71ea10f8bc1 100644 --- a/include/net/cnss_nl.h +++ b/include/net/cnss_nl.h @@ -4,6 +4,8 @@ #ifndef _NET_CNSS_GENETLINK_H_ #define _NET_CNSS_GENETLINK_H_ +#include + #define CLD80211_MAX_COMMANDS 40 #define CLD80211_MAX_NL_DATA 4096 diff --git a/include/net/cnss_prealloc.h b/include/net/cnss_prealloc.h index 74aafe27492d..ee074f5e3907 100644 --- a/include/net/cnss_prealloc.h +++ b/include/net/cnss_prealloc.h @@ -4,6 +4,8 @@ #ifndef _NET_CNSS_PREALLOC_H_ #define _NET_CNSS_PREALLOC_H_ +#include + #define WCNSS_PRE_ALLOC_GET_THRESHOLD (4*1024) extern void *wcnss_prealloc_get(size_t size); diff --git a/include/net/cnss_utils.h b/include/net/cnss_utils.h index fdac4fada497..c8d03a28a044 100644 --- a/include/net/cnss_utils.h +++ b/include/net/cnss_utils.h @@ -4,6 +4,10 @@ #ifndef _CNSS_UTILS_H_ #define _CNSS_UTILS_H_ +#include + +struct device; + enum cnss_utils_cc_src { CNSS_UTILS_SOURCE_CORE, CNSS_UTILS_SOURCE_11D, diff --git a/include/net/rmnet_config.h b/include/net/rmnet_config.h index 6437b13c631c..b98352bd6363 100644 --- a/include/net/rmnet_config.h +++ b/include/net/rmnet_config.h @@ -7,6 +7,8 @@ #ifndef _RMNET_CONFIG_H_ #define _RMNET_CONFIG_H_ +#include + struct rmnet_map_header_s { #ifndef RMNET_USE_BIG_ENDIAN_STRUCTS uint8_t pad_len:6; diff --git a/include/net/virt_wifi.h b/include/net/virt_wifi.h index 343e73968d41..9ccf3cd9996b 100644 --- a/include/net/virt_wifi.h +++ b/include/net/virt_wifi.h @@ -10,6 +10,10 @@ #ifndef __VIRT_WIFI_H #define __VIRT_WIFI_H +struct net_device; +struct wiphy; +struct cfg80211_scan_request; + struct virt_wifi_network_simulation { void (*notify_device_open)(struct net_device *dev); void (*notify_device_stop)(struct net_device *dev); diff --git a/include/soc/qcom/lpm-stats.h b/include/soc/qcom/lpm-stats.h index de01592c252a..1a540bba476c 100644 --- a/include/soc/qcom/lpm-stats.h +++ b/include/soc/qcom/lpm-stats.h @@ -7,6 +7,9 @@ #ifndef __ARCH_ARM_MACH_MSM_LPM_STATS_H #define __ARCH_ARM_MACH_MSM_LPM_STATS_H +#include +#include + struct lpm_stats; #define MAX_STR_LEN 256 diff --git a/include/soc/qcom/lpm_levels.h b/include/soc/qcom/lpm_levels.h index 3ba8d866632d..a56c2263e4f8 100644 --- a/include/soc/qcom/lpm_levels.h +++ b/include/soc/qcom/lpm_levels.h @@ -7,6 +7,10 @@ #ifndef __SOC_QCOM_LPM_LEVEL_H__ #define __SOC_QCOM_LPM_LEVEL_H__ +#include + +struct cpumask; + struct system_pm_ops { int (*enter)(struct cpumask *mask); void (*exit)(bool success); diff --git a/include/soc/qcom/memory_dump.h b/include/soc/qcom/memory_dump.h index bc84bc8d8ef8..96bf9304bc2a 100644 --- a/include/soc/qcom/memory_dump.h +++ b/include/soc/qcom/memory_dump.h @@ -6,6 +6,7 @@ #ifndef __MSM_MEMORY_DUMP_H #define __MSM_MEMORY_DUMP_H +#include #include enum dump_client_type { diff --git a/include/soc/qcom/minidump.h b/include/soc/qcom/minidump.h index 68f55e5f90ba..46ed6b8b7341 100644 --- a/include/soc/qcom/minidump.h +++ b/include/soc/qcom/minidump.h @@ -6,6 +6,8 @@ #ifndef __MINIDUMP_H #define __MINIDUMP_H +#include + #define MAX_NAME_LENGTH 12 /* md_region - Minidump table entry * @name: Entry name, Minidump will dump binary with this name. diff --git a/include/soc/qcom/qseecom_scm.h b/include/soc/qcom/qseecom_scm.h index fd6cb4573fad..8cdff3fa48fe 100644 --- a/include/soc/qcom/qseecom_scm.h +++ b/include/soc/qcom/qseecom_scm.h @@ -6,6 +6,8 @@ #ifndef __MACH_SCM_H #define __MACH_SCM_H +#include + #define SCM_SVC_BOOT 0x1 #define SCM_SVC_PIL 0x2 #define SCM_SVC_UTIL 0x3 diff --git a/include/soc/qcom/service-locator.h b/include/soc/qcom/service-locator.h index c903d5657e93..8ac27f52b2e6 100644 --- a/include/soc/qcom/service-locator.h +++ b/include/soc/qcom/service-locator.h @@ -10,6 +10,8 @@ #ifndef _SERVICE_LOCATOR_H #define _SERVICE_LOCATOR_H +#include + #define QMI_SERVREG_LOC_NAME_LENGTH_V01 64 #define QMI_SERVREG_LOC_LIST_LENGTH_V01 32 @@ -50,6 +52,8 @@ enum service_locator_state { LOCATOR_UP = 0x1F, }; +struct notifier_block; + #if IS_ENABLED(CONFIG_MSM_SERVICE_LOCATOR) /* * Use this api to request information regarding the process domains on diff --git a/include/soc/qcom/service-notifier.h b/include/soc/qcom/service-notifier.h index a60e05e56607..23c4958715bf 100644 --- a/include/soc/qcom/service-notifier.h +++ b/include/soc/qcom/service-notifier.h @@ -10,6 +10,8 @@ #ifndef _SERVICE_NOTIFIER_H #define _SERVICE_NOTIFIER_H +#include + enum qmi_servreg_notif_service_state_enum_type_v01 { QMI_SERVREG_NOTIF_SERVICE_STATE_ENUM_TYPE_MIN_VAL_V01 = INT_MIN, QMI_SERVREG_NOTIF_SERVICE_STATE_ENUM_TYPE_MAX_VAL_V01 = INT_MAX, @@ -27,6 +29,9 @@ enum pd_subsys_state { ROOT_PD_SHUTDOWN, USER_PD_STATE_CHANGE, }; + +struct notifier_block; + #if IS_ENABLED(CONFIG_MSM_SERVICE_NOTIFIER) /* service_notif_register_notifier() - Register a notifier for a service diff --git a/include/trace/events/ion.h b/include/trace/events/ion.h index 377d847d66e2..0e900341057d 100644 --- a/include/trace/events/ion.h +++ b/include/trace/events/ion.h @@ -9,6 +9,7 @@ #if !defined(_TRACE_ION_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_ION_H +#include #include #include