Merge "includes: Fix more headers to work with KERNEL_HEADER_TEST"

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 <linux/types.h>
+
 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);

include/linux/haven/hcall_common.h

@@ -5,6 +5,8 @@
 #ifndef __HH_HCALL_COMMON_H
 #define __HH_HCALL_COMMON_H
 
+#include <linux/types.h>
+
 struct hh_hcall_args {
 	unsigned long arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7;
 };

include/linux/haven/hh_common.h

@@ -7,6 +7,8 @@
 #ifndef __HH_COMMON_H
 #define __HH_COMMON_H
 
+#include <linux/types.h>
+
 /* Common Haven types */
 typedef u16 hh_vmid_t;
 typedef u32 hh_rm_msgid_t;

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);

include/linux/hwkm.h

@@ -6,6 +6,7 @@
 #ifndef __HWKM_H_
 #define __HWKM_H_
 
+#include <linux/types.h>
 #include <stdbool.h>
 #include <stddef.h>
 

include/linux/ipa_fmwk.h

@@ -6,6 +6,9 @@
 #ifndef _IPA_FMWK_H_
 #define _IPA_FMWK_H_
 
+#include <linux/types.h>
+#include <linux/ipa_usb.h>
+
 struct ipa_core_data {
 	int (*ipa_tx_dp)(enum ipa_client_type dst, struct sk_buff *skb,
 		struct ipa_tx_meta *metadata);

include/linux/mem-buf.h

@@ -6,6 +6,8 @@
 #ifndef _MEM_BUF_H
 #define _MEM_BUF_H
 
+#include <linux/err.h>
+#include <linux/errno.h>
 #include <uapi/linux/mem-buf.h>
 
 /**

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 <linux/device.h>
+#include <linux/dma-direction.h>
+#include <linux/mutex.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
 struct mhi_chan;
 struct mhi_event;
 struct mhi_ctxt;

include/linux/neuron_block.h

@@ -3,6 +3,7 @@
  * Copyright (c) 2020 The Linux Foundation. All rights reserved.
  */
 
+#include <linux/neuron.h>
 #include <linux/skbuff.h>
 #include <linux/uuid.h>
 

include/linux/platform_data/qcom_crypto_device.h

@@ -6,6 +6,8 @@
 #ifndef __QCOM_CRYPTO_DEVICE__H
 #define __QCOM_CRYPTO_DEVICE__H
 
+#include <linux/types.h>
+
 struct msm_ce_hw_support {
 	uint32_t ce_shared;
 	uint32_t shared_ce_resource;

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 <linux/spinlock.h>
+#include <linux/types.h>
+#include <linux/workqueue.h>
+
 #ifdef CONFIG_QCOM_RUN_QUEUE_STATS
 
 struct rq_data {

include/linux/soc/qcom/altmode-glink.h

@@ -6,6 +6,8 @@
 #ifndef __ALTMODE_H__
 #define __ALTMODE_H__
 
+#include <linux/types.h>
+
 /**
  * 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,

include/linux/usb/ucsi_glink.h

@@ -6,10 +6,15 @@
 #ifndef __UCSI_GLINK_H__
 #define __UCSI_GLINK_H__
 
+#include <linux/errno.h>
+#include <linux/usb/typec.h>
+
 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;
 }

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 <linux/types.h>
+
+struct notifier_block;
+
 #if defined(CONFIG_MSM_JTAG) || defined(CONFIG_MSM_JTAG_MM) || \
 	defined(CONFIG_MSM_JTAGV8)
 extern void msm_jtag_save_state(void);

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 <linux/types.h>
+
 #if IS_ENABLED(CONFIG_QCOM_SOCINFO)
 uint32_t socinfo_get_id(void);
 uint32_t socinfo_get_serial_number(void);

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 <linux/types.h>
+
 struct wcd_spi_msg {
 	/*
 	 * Caller's buffer pointer that holds data to