fm10k: simplify reading PFVFLRE register

We're doing a really convoluted bitshift and read for the PFVFLRE
register. Just reading the PFVFLRE(1), shifting it by 32, then reading
PFVFLRE(0) should be sufficient.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
index d8356c494f065c265736c17b23125ecf2c612089..dfc88a46373533d54d390d98dab9a864034bd3a8 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c
@@ -1,5 +1,5 @@
 /* Intel(R) Ethernet Switch Host Interface Driver
- * Copyright(c) 2013 - 2016 Intel Corporation.
+ * Copyright(c) 2013 - 2017 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -67,10 +67,8 @@ s32 fm10k_iov_event(struct fm10k_intfc *interface)
 
        /* read VFLRE to determine if any VFs have been reset */
        do {
-               vflre = fm10k_read_reg(hw, FM10K_PFVFLRE(0));
+               vflre = fm10k_read_reg(hw, FM10K_PFVFLRE(1));
                vflre <<= 32;
-               vflre |= fm10k_read_reg(hw, FM10K_PFVFLRE(1));
-               vflre = (vflre << 32) | (vflre >> 32);
                vflre |= fm10k_read_reg(hw, FM10K_PFVFLRE(0));
 
                i = iov_data->num_vfs;