forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h
....@@ -1,16 +1,8 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
12 /*
23  * Most ISHTP provider device and ISHTP logic declarations
34  *
45  * Copyright (c) 2003-2016, Intel Corporation.
5
- *
6
- * This program is free software; you can redistribute it and/or modify it
7
- * under the terms and conditions of the GNU General Public License,
8
- * version 2, as published by the Free Software Foundation.
9
- *
10
- * This program is distributed in the hope it will be useful, but WITHOUT
11
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
13
- * more details.
146  */
157 
168 #ifndef _ISHTP_DEV_H_
....@@ -77,32 +69,6 @@
7769 struct ishtp_fw_client {
7870 	struct ishtp_client_properties props;
7971 	uint8_t client_id;
80
-};
81
-
82
-/**
83
- * struct ishtp_msg_data - ISHTP message data struct
84
- * @size:	Size of data in the *data
85
- * @data:	Pointer to data
86
- */
87
-struct ishtp_msg_data {
88
-	uint32_t size;
89
-	unsigned char *data;
90
-};
91
-
92
-/*
93
- * struct ishtp_cl_rb - request block structure
94
- * @list:	Link to list members
95
- * @cl:		ISHTP client instance
96
- * @buffer:	message header
97
- * @buf_idx:	Index into buffer
98
- * @read_time:	 unused at this time
99
- */
100
-struct ishtp_cl_rb {
101
-	struct list_head list;
102
-	struct ishtp_cl *cl;
103
-	struct ishtp_msg_data buffer;
104
-	unsigned long buf_idx;
105
-	unsigned long read_time;
10672 };
10773 
10874 /*
....@@ -207,11 +173,9 @@
207173 	struct work_struct bh_hbm_work;
208174 
209175 	/* IPC write queue */
210
-	struct wr_msg_ctl_info wr_processing_list_head, wr_free_list_head;
176
+	struct list_head wr_processing_list, wr_free_list;
211177 	/* For both processing list  and free list */
212178 	spinlock_t wr_processing_spinlock;
213
-
214
-	spinlock_t out_ipc_spinlock;
215179 
216180 	struct ishtp_fw_client *fw_clients; /*Note:memory has to be allocated*/
217181 	DECLARE_BITMAP(fw_clients_map, ISHTP_CLIENTS_MAX);
....@@ -250,7 +214,7 @@
250214 	const struct ishtp_hw_ops *ops;
251215 	size_t	mtu;
252216 	uint32_t	ishtp_msg_hdr;
253
-	char hw[0] __aligned(sizeof(void *));
217
+	char hw[] __aligned(sizeof(void *));
254218 };
255219 
256220 static inline unsigned long ishtp_secs_to_jiffies(unsigned long sec)
....@@ -264,11 +228,6 @@
264228 static inline int ish_ipc_reset(struct ishtp_device *dev)
265229 {
266230 	return dev->ops->ipc_reset(dev);
267
-}
268
-
269
-static inline int ish_hw_reset(struct ishtp_device *dev)
270
-{
271
-	return dev->ops->hw_reset(dev);
272231 }
273232 
274233 /* Exported function */