From: Piotr Kubaj <piotrx.ku...@intel.com>
Rename version to nvm_version to avoid shadowing global variables on some
systems.
Signed-off-by: Piotr Kubaj <piotrx.ku...@intel.com>
Signed-off-by: Anatoly Burakov <anatoly.bura...@intel.com>
---
.mailmap | 2 +-
drivers/net/intel/e1000/base/e1000_i210.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.mailmap b/.mailmap
index 857af326e3..4c5600a3c2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1206,7 +1206,7 @@ Piotr Azarewicz <piotr.azarew...@intel.com>
<piotrx.t.azarew...@intel.com>
Piotr Bartosiewicz <piotr.bartosiew...@atendesoftware.pl>
Piotr Bronowski <piotrx.bronow...@intel.com>
Piotr Gardocki <piotrx.gardo...@intel.com>
-Piotr Kubaj <pku...@freebsd.org>
+Piotr Kubaj <piotrx.ku...@intel.com> <pku...@freebsd.org>
Piotr Kwapulinski <piotr.kwapulin...@intel.com>
Piotr Pietruszewski <piotr.pietruszew...@intel.com>
Piotr Raczynski <piotr.raczyn...@intel.com>
diff --git a/drivers/net/intel/e1000/base/e1000_i210.c
b/drivers/net/intel/e1000/base/e1000_i210.c
index 52800376e4..479d2dc2c2 100644
--- a/drivers/net/intel/e1000/base/e1000_i210.c
+++ b/drivers/net/intel/e1000/base/e1000_i210.c
@@ -479,7 +479,7 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
E1000_INVM_RECORD_SIZE_IN_BYTES);
u32 buffer[E1000_INVM_SIZE];
s32 status = -E1000_ERR_INVM_VALUE_NOT_FOUND;
- u16 version = 0;
+ u16 nvm_version = 0;
DEBUGFUNC("e1000_read_invm_version");
@@ -496,14 +496,14 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
/* Check if we have first version location used */
if ((i == 1) && ((*record & E1000_INVM_VER_FIELD_ONE) == 0)) {
- version = 0;
+ nvm_version = 0;
status = E1000_SUCCESS;
break;
}
/* Check if we have second version location used */
else if ((i == 1) &&
((*record & E1000_INVM_VER_FIELD_TWO) == 0)) {
- version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3;
+ nvm_version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3;
status = E1000_SUCCESS;
break;
}
@@ -514,7 +514,7 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
else if ((((*record & E1000_INVM_VER_FIELD_ONE) == 0) &&
((*record & 0x3) == 0)) || (((*record & 0x3) != 0) &&
(i != 1))) {
- version = (*next_record & E1000_INVM_VER_FIELD_TWO)
+ nvm_version = (*next_record & E1000_INVM_VER_FIELD_TWO)
>> 13;
status = E1000_SUCCESS;
break;
@@ -525,16 +525,16 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
*/
else if (((*record & E1000_INVM_VER_FIELD_TWO) == 0) &&
((*record & 0x3) == 0)) {
- version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3;
+ nvm_version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3;
status = E1000_SUCCESS;
break;
}
}
if (status == E1000_SUCCESS) {
- invm_ver->invm_major = (version & E1000_INVM_MAJOR_MASK)
+ invm_ver->invm_major = (nvm_version & E1000_INVM_MAJOR_MASK)
>> E1000_INVM_MAJOR_SHIFT;
- invm_ver->invm_minor = version & E1000_INVM_MINOR_MASK;
+ invm_ver->invm_minor = nvm_version & E1000_INVM_MINOR_MASK;
}
/* Read Image Type */
for (i = 1; i < invm_blocks; i++) {
--
2.43.5
