X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fenic%2Fbase%2Fvnic_intr.h;h=6282ae520ba66180d93188db8593a0fc764bee6a;hb=25ae7f1a5d9d127a46f8d62d1d689f77a78138fd;hp=ecb82bf4c798a454d631b47de0f90228956c5a5c;hpb=72f3de308fce9d6b537440f5f1a414c069d2c79d;p=dpdk.git

diff --git a/drivers/net/enic/base/vnic_intr.h b/drivers/net/enic/base/vnic_intr.h
index ecb82bf4c7..6282ae520b 100644
--- a/drivers/net/enic/base/vnic_intr.h
+++ b/drivers/net/enic/base/vnic_intr.h
@@ -1,37 +1,7 @@
-/*
- * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2008-2017 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
- *
- * Copyright (c) 2014, Cisco Systems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
  */
-#ident "$Id: vnic_intr.h 171146 2014-05-02 07:08:20Z ssujith $"
 
 #ifndef _VNIC_INTR_H_
 #define _VNIC_INTR_H_
@@ -44,20 +14,20 @@
 
 /* Interrupt control */
 struct vnic_intr_ctrl {
-	u32 coalescing_timer;		/* 0x00 */
-	u32 pad0;
-	u32 coalescing_value;		/* 0x08 */
-	u32 pad1;
-	u32 coalescing_type;		/* 0x10 */
-	u32 pad2;
-	u32 mask_on_assertion;		/* 0x18 */
-	u32 pad3;
-	u32 mask;			/* 0x20 */
-	u32 pad4;
-	u32 int_credits;		/* 0x28 */
-	u32 pad5;
-	u32 int_credit_return;		/* 0x30 */
-	u32 pad6;
+	uint32_t coalescing_timer;		/* 0x00 */
+	uint32_t pad0;
+	uint32_t coalescing_value;		/* 0x08 */
+	uint32_t pad1;
+	uint32_t coalescing_type;		/* 0x10 */
+	uint32_t pad2;
+	uint32_t mask_on_assertion;		/* 0x18 */
+	uint32_t pad3;
+	uint32_t mask;				/* 0x20 */
+	uint32_t pad4;
+	uint32_t int_credits;			/* 0x28 */
+	uint32_t pad5;
+	uint32_t int_credit_return;		/* 0x30 */
+	uint32_t pad6;
 };
 
 struct vnic_intr {
@@ -87,7 +57,7 @@ static inline void vnic_intr_return_credits(struct vnic_intr *intr,
 #define VNIC_INTR_UNMASK_SHIFT		16
 #define VNIC_INTR_RESET_TIMER_SHIFT	17
 
-	u32 int_credit_return = (credits & 0xffff) |
+	uint32_t int_credit_return = (credits & 0xffff) |
 		(unmask ? (1 << VNIC_INTR_UNMASK_SHIFT) : 0) |
 		(reset_timer ? (1 << VNIC_INTR_RESET_TIMER_SHIFT) : 0);
 
@@ -108,7 +78,7 @@ static inline void vnic_intr_return_all_credits(struct vnic_intr *intr)
 	vnic_intr_return_credits(intr, credits, unmask, reset_timer);
 }
 
-static inline u32 vnic_intr_legacy_pba(u32 __iomem *legacy_pba)
+static inline uint32_t vnic_intr_legacy_pba(uint32_t __iomem *legacy_pba)
 {
 	/* read PBA without clearing */
 	return ioread32(legacy_pba);
@@ -117,10 +87,10 @@ static inline u32 vnic_intr_legacy_pba(u32 __iomem *legacy_pba)
 void vnic_intr_free(struct vnic_intr *intr);
 int vnic_intr_alloc(struct vnic_dev *vdev, struct vnic_intr *intr,
 	unsigned int index);
-void vnic_intr_init(struct vnic_intr *intr, u32 coalescing_timer,
+void vnic_intr_init(struct vnic_intr *intr, uint32_t coalescing_timer,
 	unsigned int coalescing_type, unsigned int mask_on_assertion);
 void vnic_intr_coalescing_timer_set(struct vnic_intr *intr,
-	u32 coalescing_timer);
+	uint32_t coalescing_timer);
 void vnic_intr_clean(struct vnic_intr *intr);
 
 #endif /* _VNIC_INTR_H_ */