Merge "soc: qcom: glink: Fix missing includes and declaration ordering" (ec1a55e4) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/soc/qcom/glink_private.h

+35 −26

Original line number	Diff line number	Diff line
		@@ -12,7 +12,21 @@
		#ifndef _SOC_QCOM_GLINK_PRIVATE_H_
		#define _SOC_QCOM_GLINK_PRIVATE_H_

		#include <linux/bug.h>
		#include <linux/completion.h>
		#include <linux/dcache.h>
		#include <linux/ipc_logging.h>
		#include <linux/kernel.h>
		#include <linux/kref.h>
		#include <linux/seq_file.h>
		#include <linux/spinlock.h>
		#include <linux/types.h>
		#include <soc/qcom/glink.h>

		struct glink_core_xprt_ctx;
		struct channel_ctx;
		enum transport_state_e;
		enum local_channel_state_e;

		/* Logging Macros */
		enum {
		@@ -78,11 +92,6 @@ struct glink_ch_intent_info {
		struct list_head *ri_list;
		};

		struct glink_core_xprt_ctx;
		struct channel_ctx;
		enum transport_state_e;
		enum local_channel_state_e;

		/* Tracer Packet Event IDs for G-Link */
		enum glink_tracer_pkt_events {
		GLINK_CORE_TX = 1,
		@@ -636,6 +645,27 @@ enum ssr_command {
		GLINK_SSR_CLEANUP_DONE,
		};

		/**
		* struct ssr_notify_data - Contains private data used for client notifications
		* from G-Link.
		* tx_done: Indicates whether or not the tx_done notification has been
		* received.
		* event: The state notification event received.
		* responded: Indicates whether or not a cleanup_done response was received.
		* version: G-Link SSR protocol version
		* seq_num: G-Link SSR protocol sequence number
		* edge: The G-Link edge name for the channel associated with this
		* callback data
		*/
		struct ssr_notify_data {
		bool tx_done;
		unsigned event;
		bool responded;
		uint32_t version;
		uint32_t seq_num;
		const char *edge;
		};

		/**
		* struct subsys_info - Subsystem info structure
		* ssr_name: name of the subsystem recognized by the SSR framework
		@@ -717,27 +747,6 @@ struct cleanup_done_msg {
		uint32_t seq_num;
		};

		/**
		* struct ssr_notify_data - Contains private data used for client notifications
		* from G-Link.
		* tx_done: Indicates whether or not the tx_done notification has been
		* received.
		* event: The state notification event received.
		* responded: Indicates whether or not a cleanup_done response was received.
		* version: G-Link SSR protocol version
		* seq_num: G-Link SSR protocol sequence number
		* edge: The G-Link edge name for the channel associated with this
		* callback data
		*/
		struct ssr_notify_data {
		bool tx_done;
		unsigned event;
		bool responded;
		uint32_t version;
		uint32_t seq_num;
		const char *edge;
		};

		/**
		* get_info_for_subsystem() - Retrieve information about a subsystem from the
		* global subsystem_info_list