forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/drivers/scsi/libfc/fc_disc.c
....@@ -1,18 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23  * Copyright(c) 2007 - 2008 Intel Corporation. All rights reserved.
3
- *
4
- * This program is free software; you can redistribute it and/or modify it
5
- * under the terms and conditions of the GNU General Public License,
6
- * version 2, as published by the Free Software Foundation.
7
- *
8
- * This program is distributed in the hope it will be useful, but WITHOUT
9
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
11
- * more details.
12
- *
13
- * You should have received a copy of the GNU General Public License along with
14
- * this program; if not, write to the Free Software Foundation, Inc.,
15
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
164  *
175  * Maintained at www.Open-FCoE.org
186  */
....@@ -313,8 +301,8 @@
313301 	struct fc_lport *lport = fc_disc_lport(disc);
314302 	unsigned long delay = 0;
315303 
316
-	FC_DISC_DBG(disc, "Error %ld, retries %d/%d\n",
317
-		    PTR_ERR(fp), disc->retry_count,
304
+	FC_DISC_DBG(disc, "Error %d, retries %d/%d\n",
305
+		    PTR_ERR_OR_ZERO(fp), disc->retry_count,
318306 		    FC_DISC_RETRY_LIMIT);
319307 
320308 	if (!fp || PTR_ERR(fp) == -FC_EX_TIMEOUT) {
....@@ -349,7 +337,7 @@
349337 
350338 /**
351339  * fc_disc_gpn_ft_req() - Send Get Port Names by FC-4 type (GPN_FT) request
352
- * @lport: The discovery context
340
+ * @disc: The discovery context
353341  */
354342 static void fc_disc_gpn_ft_req(struct fc_disc *disc)
355343 {
....@@ -382,7 +370,7 @@
382370 
383371 /**
384372  * fc_disc_gpn_ft_parse() - Parse the body of the dNS GPN_FT response.
385
- * @lport: The local port the GPN_FT was received on
373
+ * @disc:  The discovery context
386374  * @buf:   The GPN_FT response buffer
387375  * @len:   The size of response buffer
388376  *
....@@ -500,7 +488,7 @@
500488  * fc_disc_gpn_ft_resp() - Handle a response frame from Get Port Names (GPN_FT)
501489  * @sp:	    The sequence that the GPN_FT response was received on
502490  * @fp:	    The GPN_FT response frame
503
- * @lp_arg: The discovery context
491
+ * @disc_arg: The discovery context
504492  *
505493  * Locking Note: This function is called without disc mutex held, and
506494  *		 should do all its processing with the mutex held