[openib-general] [PATCH][SDP][13/33] Fix comment style in sdp_iocb.h

Tom Duffy Tom.Duffy at Sun.COM
Thu Feb 17 14:10:43 PST 2005


Signed-off-by: Tom Duffy <tduffy at sun.com>

--- drivers/infiniband/ulp/sdp-orig/sdp_iocb.h	2005-02-10 18:42:56.974015000 -0800
+++ drivers/infiniband/ulp/sdp/sdp_iocb.h	2005-02-17 10:55:51.305015000 -0800
@@ -1,25 +1,36 @@
 /*
-  This software is available to you under a choice of one of two
-  licenses.  You may choose to be licensed under the terms of the GNU
-  General Public License (GPL) Version 2, available at
-  <http://www.fsf.org/copyleft/gpl.html>, or the OpenIB.org BSD
-  license, available in the LICENSE.TXT file accompanying this
-  software.  These details are also available at
-  <http://openib.org/license.html>.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-
-  Copyright (c) 2005 Topspin Communications.  All rights reserved.
-
-  $Id: sdp_iocb.h 696 2004-08-28 03:10:21Z roland $
-*/
+ * Copyright (c) 2005 Topspin Communications.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * $Id$
+ */
 
 #ifndef _SDP_IOCB_H
 #define _SDP_IOCB_H
@@ -53,9 +64,10 @@
  */
 #define sdp_iocb_q_size(table) ((table)->size)
 
-/* ----------------------------------------------------------------------- */
-/* INET read/write IOCBs                                                   */
-/* ----------------------------------------------------------------------- */
+/*
+ * INET read/write IOCBs
+ */
+
 /*
  * save a kvec read/write for processing once data shows up.
  */
@@ -103,6 +115,7 @@ struct sdpc_iocb {
 	struct kiocb *req;
 	struct sock_iocb *si;
 }; /* struct sdpc_iocb */
+
 /*
  * table for IOCBs
  */
@@ -111,45 +124,31 @@ struct sdpc_iocb_q {
 	int size;               /* current number of IOCBs in table */
 }; /* struct sdpc_iocb_q */
 
-/* ----------------------------------------------------------------------- */
-/*                                                                         */
-/* Address translations                                                    */
-/*                                                                         */
-/* ----------------------------------------------------------------------- */
-/* =========================================================== */
-/*..__sdp_kmap -- map a page into kernel space */
-static __inline__ void *__sdp_kmap
-(
- struct page *page
-)
-{
-  if (in_atomic() || irqs_disabled()) {
-    
-    return kmap_atomic(page, KM_IRQ0);
-  }
-  else {
+/*
+ * Address translations
+ */
 
-    return kmap(page);
-  }
+/*
+ * __sdp_kmap - map a page into kernel space
+ */
+static __inline__ void *__sdp_kmap(struct page *page)
+{
+	if (in_atomic() || irqs_disabled())
+		return kmap_atomic(page, KM_IRQ0);
+	else
+		return kmap(page);
 } /* __sdp_kmap */
 
-/* =========================================================== */
-/*..__sdp_kunmap -- unmap a page into kernel space */
-static __inline__ void __sdp_kunmap
-(
- struct page *page
-)
+/*
+ * __sdp_kunmap - unmap a page into kernel space
+ */
+static __inline__ void __sdp_kunmap(struct page *page)
 {
-  if (in_atomic() || irqs_disabled()) {
-    
-    kunmap_atomic(page, KM_IRQ0);
-  }
-  else {
-
-    kunmap(page);
-  }
-
-  return;
+	if (in_atomic() || irqs_disabled())
+		kunmap_atomic(page, KM_IRQ0);
+	else
+		kunmap(page);
+	return;
 } /* __sdp_kunmap */
 
 #endif /* _SDP_IOCB_H */




More information about the general mailing list