aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbevf/vf.h
diff options
context:
space:
mode:
authorMark Rustad <mark.d.rustad@intel.com>2014-03-18 07:03:35 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-03-31 15:48:01 -0700
commit32c74949b4e37f80ab74d9b497ffb3749cfcb85a (patch)
tree2190761f56a8d7c1e898e94e6e9ccbec397a46c1 /drivers/net/ethernet/intel/ixgbevf/vf.h
parentixgbe: fix ixgbe_check_reset_blocked() declaration (diff)
downloadlinux-dev-32c74949b4e37f80ab74d9b497ffb3749cfcb85a.tar.xz
linux-dev-32c74949b4e37f80ab74d9b497ffb3749cfcb85a.zip
ixgbevf: Change ixgbe_read_reg to ixgbevf_read_reg
Change the ixgbe_read_reg function name to ixgbevf_read_reg to avoid a namespace clash with the ixgbe driver. This will allow ixgbe to take its register read function out-of-line to reduce memory footprint. Signed-off-by: Mark Rustad <mark.d.rustad@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to '')
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/vf.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
index 096d33a59def..3061d1890471 100644
--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
@@ -186,8 +186,8 @@ static inline void ixgbe_write_reg(struct ixgbe_hw *hw, u32 reg, u32 value)
}
#define IXGBE_WRITE_REG(h, r, v) ixgbe_write_reg(h, r, v)
-u32 ixgbe_read_reg(struct ixgbe_hw *hw, u32 reg);
-#define IXGBE_READ_REG(h, r) ixgbe_read_reg(h, r)
+u32 ixgbevf_read_reg(struct ixgbe_hw *hw, u32 reg);
+#define IXGBE_READ_REG(h, r) ixgbevf_read_reg(h, r)
static inline void ixgbe_write_reg_array(struct ixgbe_hw *hw, u32 reg,
u32 offset, u32 value)
@@ -199,7 +199,7 @@ static inline void ixgbe_write_reg_array(struct ixgbe_hw *hw, u32 reg,
static inline u32 ixgbe_read_reg_array(struct ixgbe_hw *hw, u32 reg,
u32 offset)
{
- return ixgbe_read_reg(hw, reg + (offset << 2));
+ return ixgbevf_read_reg(hw, reg + (offset << 2));
}
#define IXGBE_READ_REG_ARRAY(h, r, o) ixgbe_read_reg_array(h, r, o)