rtl88x2CE_WiFi_linux add concurrent mode

hc

2024-09-20 cf4ce59b3b70238352c7f1729f0f7223214828ad

 kernel/sound/xen/xen_snd_front.c
..
..
@@ -16,12 +16,12 @@
16
16
 #include <xen/xen.h>
17
17
 #include <xen/xenbus.h>
18
18
 
19
+#include <xen/xen-front-pgdir-shbuf.h>
19
20
 #include <xen/interface/io/sndif.h>
20
21
 
21
22
 #include "xen_snd_front.h"
22
23
 #include "xen_snd_front_alsa.h"
23
24
 #include "xen_snd_front_evtchnl.h"
24
-#include "xen_snd_front_shbuf.h"
25
25
 
26
26
 static struct xensnd_req *
27
27
 be_stream_prepare_req(struct xen_snd_front_evtchnl *evtchnl, u8 operation)
..
..
@@ -82,7 +82,7 @@
82
82
 }
83
83
 
84
84
 int xen_snd_front_stream_prepare(struct xen_snd_front_evtchnl *evtchnl,
85
-				 struct xen_snd_front_shbuf *sh_buf,
85
+				 struct xen_front_pgdir_shbuf *shbuf,
86
86
 				 u8 format, unsigned int channels,
87
87
 				 unsigned int rate, u32 buffer_sz,
88
88
 				 u32 period_sz)
..
..
@@ -99,7 +99,8 @@
99
99
 	req->op.open.pcm_rate = rate;
100
100
 	req->op.open.buffer_sz = buffer_sz;
101
101
 	req->op.open.period_sz = period_sz;
102
-	req->op.open.gref_directory = xen_snd_front_shbuf_get_dir_start(sh_buf);
102
+	req->op.open.gref_directory =
103
+		xen_front_pgdir_shbuf_get_dir_start(shbuf);
103
104
 	mutex_unlock(&evtchnl->ring_io_lock);
104
105
 
105
106
 	ret = be_stream_do_io(evtchnl);
..
..
@@ -113,7 +114,7 @@
113
114
 
114
115
 int xen_snd_front_stream_close(struct xen_snd_front_evtchnl *evtchnl)
115
116
 {
116
-	struct xensnd_req *req;
117
+	__always_unused struct xensnd_req *req;
117
118
 	int ret;
118
119
 
119
120
 	mutex_lock(&evtchnl->u.req.req_io_lock);
..
..
@@ -245,11 +246,8 @@
245
246
 
246
247
 	switch (backend_state) {
247
248
 	case XenbusStateReconfiguring:
248
-		/* fall through */
249
249
 	case XenbusStateReconfigured:
250
-		/* fall through */
251
250
 	case XenbusStateInitialised:
252
-		/* fall through */
253
251
 		break;
254
252
 
255
253
 	case XenbusStateInitialising:
..
..
@@ -288,7 +286,6 @@
288
286
 		break;
289
287
 
290
288
 	case XenbusStateUnknown:
291
-		/* fall through */
292
289
 	case XenbusStateClosed:
293
290
 		if (xb_dev->state == XenbusStateClosed)
294
291
 			break;