AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/infiniband/sw/rxe/rxe_queue.c
..
..
@@ -1,34 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
1
2
 /*
2
3
  * Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved.
3
4
  * Copyright (c) 2015 System Fabric Works, Inc. All rights reserved.
4
- *
5
- * This software is available to you under a choice of one of two
6
- * licenses.  You may choose to be licensed under the terms of the GNU
7
- * General Public License (GPL) Version 2, available from the file
8
- * COPYING in the main directory of this source tree, or the
9
- * OpenIB.org BSD license below:
10
- *
11
- *     Redistribution and use in source and binary forms, with or
12
- *     without modification, are permitted provided that the following
13
- *     conditions are met:
14
- *
15
- *	- Redistributions of source code must retain the above
16
- *	  copyright notice, this list of conditions and the following
17
- *	  disclaimer.
18
- *
19
- *	- Redistributions in binary form must retailuce the above
20
- *	  copyright notice, this list of conditions and the following
21
- *	  disclaimer in the documentation and/or other materials
22
- *	  provided with the distribution.
23
- *
24
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
25
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
27
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
28
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
29
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
30
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
31
- * SOFTWARE.
32
5
  */
33
6
 
34
7
 #include <linux/vmalloc.h>
..
..
@@ -36,24 +9,24 @@
36
9
 #include "rxe_loc.h"
37
10
 #include "rxe_queue.h"
38
11
 
39
-int do_mmap_info(struct rxe_dev *rxe,
40
-		 struct mminfo __user *outbuf,
41
-		 struct ib_ucontext *context,
42
-		 struct rxe_queue_buf *buf,
43
-		 size_t buf_size,
44
-		 struct rxe_mmap_info **ip_p)
12
+int do_mmap_info(struct rxe_dev *rxe, struct mminfo __user *outbuf,
13
+		 struct ib_udata *udata, struct rxe_queue_buf *buf,
14
+		 size_t buf_size, struct rxe_mmap_info **ip_p)
45
15
 {
46
16
 	int err;
47
17
 	struct rxe_mmap_info *ip = NULL;
48
18
 
49
19
 	if (outbuf) {
50
-		ip = rxe_create_mmap_info(rxe, buf_size, context, buf);
51
-		if (!ip)
20
+		ip = rxe_create_mmap_info(rxe, buf_size, udata, buf);
21
+		if (IS_ERR(ip)) {
22
+			err = PTR_ERR(ip);
52
23
 			goto err1;
24
+		}
53
25
 
54
-		err = copy_to_user(outbuf, &ip->info, sizeof(ip->info));
55
-		if (err)
26
+		if (copy_to_user(outbuf, &ip->info, sizeof(ip->info))) {
27
+			err = -EFAULT;
56
28
 			goto err2;
29
+		}
57
30
 
58
31
 		spin_lock_bh(&rxe->pending_lock);
59
32
 		list_add(&ip->pending_mmaps, &rxe->pending_mmaps);
..
..
@@ -67,7 +40,7 @@
67
40
 err2:
68
41
 	kfree(ip);
69
42
 err1:
70
-	return -EINVAL;
43
+	return err;
71
44
 }
72
45
 
73
46
 inline void rxe_queue_reset(struct rxe_queue *q)
..
..
@@ -153,12 +126,9 @@
153
126
 	return 0;
154
127
 }
155
128
 
156
-int rxe_queue_resize(struct rxe_queue *q,
157
-		     unsigned int *num_elem_p,
158
-		     unsigned int elem_size,
159
-		     struct ib_ucontext *context,
160
-		     struct mminfo __user *outbuf,
161
-		     spinlock_t *producer_lock,
129
+int rxe_queue_resize(struct rxe_queue *q, unsigned int *num_elem_p,
130
+		     unsigned int elem_size, struct ib_udata *udata,
131
+		     struct mminfo __user *outbuf, spinlock_t *producer_lock,
162
132
 		     spinlock_t *consumer_lock)
163
133
 {
164
134
 	struct rxe_queue *new_q;
..
..
@@ -170,7 +140,7 @@
170
140
 	if (!new_q)
171
141
 		return -ENOMEM;
172
142
 
173
-	err = do_mmap_info(new_q->rxe, outbuf, context, new_q->buf,
143
+	err = do_mmap_info(new_q->rxe, outbuf, udata, new_q->buf,
174
144
 			   new_q->buf_size, &new_q->ip);
175
145
 	if (err) {
176
146
 		vfree(new_q->buf);