change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/scsi/aacraid/dpcsup.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *	Adaptec AAC series RAID controller driver
3
4
  *	(c) Copyright 2001 Red Hat Inc.
..
..
@@ -9,26 +10,10 @@
9
10
  *               2010-2015 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
10
11
  *		 2016-2017 Microsemi Corp. (aacraid@microsemi.com)
11
12
  *
12
- * This program is free software; you can redistribute it and/or modify
13
- * it under the terms of the GNU General Public License as published by
14
- * the Free Software Foundation; either version 2, or (at your option)
15
- * any later version.
16
- *
17
- * This program is distributed in the hope that it will be useful,
18
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
19
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
20
- * GNU General Public License for more details.
21
- *
22
- * You should have received a copy of the GNU General Public License
23
- * along with this program; see the file COPYING.  If not, write to
24
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
25
- *
26
13
  * Module Name:
27
14
  *  dpcsup.c
28
15
  *
29
16
  * Abstract: All DPC processing routines for the cyclone board occur here.
30
- *
31
- *
32
17
  */
33
18
 
34
19
 #include <linux/kernel.h>
..
..
@@ -38,7 +23,6 @@
38
23
 #include <linux/slab.h>
39
24
 #include <linux/completion.h>
40
25
 #include <linux/blkdev.h>
41
-#include <linux/semaphore.h>
42
26
 
43
27
 #include "aacraid.h"
44
28
 
..
..
@@ -115,10 +99,11 @@
115
99
 		}
116
100
 		if (hwfib->header.XferState & cpu_to_le32(NoResponseExpected | Async)) 
117
101
 		{
118
-	        	if (hwfib->header.XferState & cpu_to_le32(NoResponseExpected))
102
+			if (hwfib->header.XferState & cpu_to_le32(NoResponseExpected)) {
119
103
 				FIB_COUNTER_INCREMENT(aac_config.NoResponseRecved);
120
-			else 
104
+			} else {
121
105
 				FIB_COUNTER_INCREMENT(aac_config.AsyncRecved);
106
+			}
122
107
 			/*
123
108
 			 *	NOTE:  we cannot touch the fib after this
124
109
 			 *	    call, because it may have been deallocated.
..
..
@@ -129,7 +114,7 @@
129
114
 			spin_lock_irqsave(&fib->event_lock, flagv);
130
115
 			if (!fib->done) {
131
116
 				fib->done = 1;
132
-				up(&fib->event_wait);
117
+				complete(&fib->event_wait);
133
118
 			}
134
119
 			spin_unlock_irqrestore(&fib->event_lock, flagv);
135
120
 
..
..
@@ -245,7 +230,6 @@
245
230
 	struct fib *fibctx;
246
231
 	struct aac_dev *dev;
247
232
 	struct aac_aifcmd *cmd;
248
-	int status;
249
233
 
250
234
 	fibctx = (struct fib *)context;
251
235
 	BUG_ON(fibptr == NULL);
..
..
@@ -265,7 +249,7 @@
265
249
 	cmd = (struct aac_aifcmd *) fib_data(fibctx);
266
250
 	cmd->command = cpu_to_le32(AifReqEvent);
267
251
 
268
-	status = aac_fib_send(AifRequest,
252
+	aac_fib_send(AifRequest,
269
253
 		fibctx,
270
254
 		sizeof(struct hw_fib)-sizeof(struct aac_fibhdr),
271
255
 		FsaNormal,
..
..
@@ -274,7 +258,7 @@
274
258
 }
275
259
 
276
260
 
277
-/**
261
+/*
278
262
  *	aac_intr_normal	-	Handle command replies
279
263
  *	@dev: Device
280
264
  *	@index: completion reference
..
..
@@ -376,16 +360,16 @@
376
360
 				start_callback = 1;
377
361
 			} else {
378
362
 				unsigned long flagv;
379
-				int complete = 0;
363
+				int completed = 0;
380
364
 
381
365
 				dprintk((KERN_INFO "event_wait up\n"));
382
366
 				spin_lock_irqsave(&fib->event_lock, flagv);
383
367
 				if (fib->done == 2) {
384
368
 					fib->done = 1;
385
-					complete = 1;
369
+					completed = 1;
386
370
 				} else {
387
371
 					fib->done = 1;
388
-					up(&fib->event_wait);
372
+					complete(&fib->event_wait);
389
373
 				}
390
374
 				spin_unlock_irqrestore(&fib->event_lock, flagv);
391
375
 
..
..
@@ -395,7 +379,7 @@
395
379
 					mflags);
396
380
 
397
381
 				FIB_COUNTER_INCREMENT(aac_config.NativeRecved);
398
-				if (complete)
382
+				if (completed)
399
383
 					aac_fib_complete(fib);
400
384
 			}
401
385
 		} else {
..
..
@@ -419,25 +403,26 @@
419
403
 			if (hwfib->header.XferState &
420
404
 				cpu_to_le32(NoResponseExpected | Async)) {
421
405
 				if (hwfib->header.XferState & cpu_to_le32(
422
-					NoResponseExpected))
406
+					NoResponseExpected)) {
423
407
 					FIB_COUNTER_INCREMENT(
424
408
 						aac_config.NoResponseRecved);
425
-				else
409
+				} else {
426
410
 					FIB_COUNTER_INCREMENT(
427
411
 						aac_config.AsyncRecved);
412
+				}
428
413
 				start_callback = 1;
429
414
 			} else {
430
415
 				unsigned long flagv;
431
-				int complete = 0;
416
+				int completed = 0;
432
417
 
433
418
 				dprintk((KERN_INFO "event_wait up\n"));
434
419
 				spin_lock_irqsave(&fib->event_lock, flagv);
435
420
 				if (fib->done == 2) {
436
421
 					fib->done = 1;
437
-					complete = 1;
422
+					completed = 1;
438
423
 				} else {
439
424
 					fib->done = 1;
440
-					up(&fib->event_wait);
425
+					complete(&fib->event_wait);
441
426
 				}
442
427
 				spin_unlock_irqrestore(&fib->event_lock, flagv);
443
428
 
..
..
@@ -447,7 +432,7 @@
447
432
 					mflags);
448
433
 
449
434
 				FIB_COUNTER_INCREMENT(aac_config.NormalRecved);
450
-				if (complete)
435
+				if (completed)
451
436
 					aac_fib_complete(fib);
452
437
 			}
453
438
 		}