From 1155af87e3e3bd2b3540409bcedb15227b28681a Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Thu, 2 Apr 2020 17:39:44 -0600 Subject: [PATCH] includes: Fix more headers to work with KERNEL_HEADER_TEST Fix other headers to work when KERNEL_HEADER_TEST is enabled by adding dependencies and advance struct prototypes where appropriate. Change-Id: Ic0dedbad6804e5dca75b33b3d0ae9e3b89a51669 Signed-off-by: Jordan Crouse --- include/linux/adc-tm-clients.h | 6 +++++- include/linux/haven/hcall_common.h | 2 ++ include/linux/haven/hh_common.h | 2 ++ include/linux/haven/hh_rm_drv.h | 2 ++ include/linux/hwkm.h | 1 + include/linux/ipa_fmwk.h | 3 +++ include/linux/mem-buf.h | 2 ++ include/linux/mhi.h | 9 ++++++++- include/linux/neuron_block.h | 1 + include/linux/platform_data/qcom_crypto_device.h | 2 ++ include/linux/rq_stats.h | 6 +++++- include/linux/soc/qcom/altmode-glink.h | 5 +++++ include/linux/usb/ucsi_glink.h | 7 ++++++- include/soc/qcom/jtag.h | 6 +++++- include/soc/qcom/socinfo.h | 4 +++- include/sound/wcd-spi.h | 4 +++- 16 files changed, 55 insertions(+), 7 deletions(-) diff --git a/include/linux/adc-tm-clients.h b/include/linux/adc-tm-clients.h index 80b869b9c4162..8b39f15720fc4 100644 --- a/include/linux/adc-tm-clients.h +++ b/include/linux/adc-tm-clients.h @@ -1,11 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved. */ #ifndef __QCOM_ADC_TM_H_CLIENTS__ #define __QCOM_ADC_TM_H_CLIENTS__ +#include + struct adc_tm_chip; /** @@ -69,6 +71,8 @@ struct adc_tm_param { void *ctx); }; +struct device; + /* Public API */ #if IS_ENABLED(CONFIG_QTI_ADC_TM) struct adc_tm_chip *get_adc_tm(struct device *dev, const char *name); diff --git a/include/linux/haven/hcall_common.h b/include/linux/haven/hcall_common.h index f6ada3eabd0d6..166bf78186b98 100644 --- a/include/linux/haven/hcall_common.h +++ b/include/linux/haven/hcall_common.h @@ -5,6 +5,8 @@ #ifndef __HH_HCALL_COMMON_H #define __HH_HCALL_COMMON_H +#include + struct hh_hcall_args { unsigned long arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7; }; diff --git a/include/linux/haven/hh_common.h b/include/linux/haven/hh_common.h index f1a7ab0044e99..a1e691166f30e 100644 --- a/include/linux/haven/hh_common.h +++ b/include/linux/haven/hh_common.h @@ -7,6 +7,8 @@ #ifndef __HH_COMMON_H #define __HH_COMMON_H +#include + /* Common Haven types */ typedef u16 hh_vmid_t; typedef u32 hh_rm_msgid_t; diff --git a/include/linux/haven/hh_rm_drv.h b/include/linux/haven/hh_rm_drv.h index cecae4ef403bc..0dbe699fc41c6 100644 --- a/include/linux/haven/hh_rm_drv.h +++ b/include/linux/haven/hh_rm_drv.h @@ -169,6 +169,8 @@ struct hh_rm_notif_vm_console_chars { u8 bytes[0]; } __packed; +struct notifier_block; + /* End Notification type APIs */ int hh_rm_register_notifier(struct notifier_block *nb); diff --git a/include/linux/hwkm.h b/include/linux/hwkm.h index 4af06b9253374..3b2ee303eefc4 100644 --- a/include/linux/hwkm.h +++ b/include/linux/hwkm.h @@ -6,6 +6,7 @@ #ifndef __HWKM_H_ #define __HWKM_H_ +#include #include #include diff --git a/include/linux/ipa_fmwk.h b/include/linux/ipa_fmwk.h index ea5b46dbfc20b..91de1f44605ef 100644 --- a/include/linux/ipa_fmwk.h +++ b/include/linux/ipa_fmwk.h @@ -6,6 +6,9 @@ #ifndef _IPA_FMWK_H_ #define _IPA_FMWK_H_ +#include +#include + struct ipa_core_data { int (*ipa_tx_dp)(enum ipa_client_type dst, struct sk_buff *skb, struct ipa_tx_meta *metadata); diff --git a/include/linux/mem-buf.h b/include/linux/mem-buf.h index 93361c3225e8a..9f8b1f34efdcf 100644 --- a/include/linux/mem-buf.h +++ b/include/linux/mem-buf.h @@ -6,6 +6,8 @@ #ifndef _MEM_BUF_H #define _MEM_BUF_H +#include +#include #include /** diff --git a/include/linux/mhi.h b/include/linux/mhi.h index 7f974e2d59912..a905eec191549 100644 --- a/include/linux/mhi.h +++ b/include/linux/mhi.h @@ -1,9 +1,16 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. */ +/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. */ #ifndef _MHI_H_ #define _MHI_H_ +#include +#include +#include +#include +#include +#include + struct mhi_chan; struct mhi_event; struct mhi_ctxt; diff --git a/include/linux/neuron_block.h b/include/linux/neuron_block.h index b403613f73d65..73f615e078c31 100644 --- a/include/linux/neuron_block.h +++ b/include/linux/neuron_block.h @@ -3,6 +3,7 @@ * Copyright (c) 2020 The Linux Foundation. All rights reserved. */ +#include #include #include diff --git a/include/linux/platform_data/qcom_crypto_device.h b/include/linux/platform_data/qcom_crypto_device.h index 1e7116ba8f36a..819df7c5e5af4 100644 --- a/include/linux/platform_data/qcom_crypto_device.h +++ b/include/linux/platform_data/qcom_crypto_device.h @@ -6,6 +6,8 @@ #ifndef __QCOM_CRYPTO_DEVICE__H #define __QCOM_CRYPTO_DEVICE__H +#include + struct msm_ce_hw_support { uint32_t ce_shared; uint32_t shared_ce_resource; diff --git a/include/linux/rq_stats.h b/include/linux/rq_stats.h index 359f159354faa..042fc47e7d8e9 100644 --- a/include/linux/rq_stats.h +++ b/include/linux/rq_stats.h @@ -1,8 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2011,2013-2014,2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2011,2013-2014,2019-2020, The Linux Foundation. All rights reserved. */ +#include +#include +#include + #ifdef CONFIG_QCOM_RUN_QUEUE_STATS struct rq_data { diff --git a/include/linux/soc/qcom/altmode-glink.h b/include/linux/soc/qcom/altmode-glink.h index e633559951127..f93c1983c6229 100644 --- a/include/linux/soc/qcom/altmode-glink.h +++ b/include/linux/soc/qcom/altmode-glink.h @@ -6,6 +6,8 @@ #ifndef __ALTMODE_H__ #define __ALTMODE_H__ +#include + /** * struct altmode_client_data * Uniquely define altmode client while registering with altmode framework. @@ -36,6 +38,9 @@ struct altmode_pan_ack_msg { #if IS_ENABLED(CONFIG_QTI_ALTMODE_GLINK) +struct notifier_block; +struct device; + int altmode_register_notifier(const char *amdev_name, struct notifier_block *nb); int altmode_deregister_notifier(struct altmode_client *client, diff --git a/include/linux/usb/ucsi_glink.h b/include/linux/usb/ucsi_glink.h index db46b5f2548a5..67d2c8afd6c2b 100644 --- a/include/linux/usb/ucsi_glink.h +++ b/include/linux/usb/ucsi_glink.h @@ -6,10 +6,15 @@ #ifndef __UCSI_GLINK_H__ #define __UCSI_GLINK_H__ +#include +#include + struct ucsi_glink_constat_info { enum typec_accessory acc; }; +struct notifier_block; + #if IS_ENABLED(CONFIG_UCSI_QTI_GLINK) int register_ucsi_glink_notifier(struct notifier_block *nb); @@ -22,7 +27,7 @@ static inline int register_ucsi_glink_notifier(struct notifier_block *nb) return -ENODEV; } -static inline int unregister_ucsi_glink_notifier(struct notifier_block *nb); +static inline int unregister_ucsi_glink_notifier(struct notifier_block *nb) { return -ENODEV; } diff --git a/include/soc/qcom/jtag.h b/include/soc/qcom/jtag.h index fca99fb092657..6deeae249884c 100644 --- a/include/soc/qcom/jtag.h +++ b/include/soc/qcom/jtag.h @@ -1,11 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2012-2015, 2017-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2015, 2017-2020, The Linux Foundation. All rights reserved. */ #ifndef __MACH_JTAG_H #define __MACH_JTAG_H +#include + +struct notifier_block; + #if defined(CONFIG_MSM_JTAG) || defined(CONFIG_MSM_JTAG_MM) || \ defined(CONFIG_MSM_JTAGV8) extern void msm_jtag_save_state(void); diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h index 267b65631049d..0a73d4815ac9a 100644 --- a/include/soc/qcom/socinfo.h +++ b/include/soc/qcom/socinfo.h @@ -1,11 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. */ #ifndef __SOC_QCOM_SOCINFO_H__ #define __SOC_QCOM_SOCINFO_H__ +#include + #if IS_ENABLED(CONFIG_QCOM_SOCINFO) uint32_t socinfo_get_id(void); uint32_t socinfo_get_serial_number(void); diff --git a/include/sound/wcd-spi.h b/include/sound/wcd-spi.h index 910475cd59dd5..14470ea51557a 100644 --- a/include/sound/wcd-spi.h +++ b/include/sound/wcd-spi.h @@ -1,11 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. */ #ifndef __WCD_SPI_H__ #define __WCD_SPI_H__ +#include + struct wcd_spi_msg { /* * Caller's buffer pointer that holds data to