summaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/e1000_hw.h
diff options
context:
space:
mode:
authorAlexander Duyck2009-02-07 00:17:47 +0100
committerDavid S. Miller2009-02-07 11:43:06 +0100
commit312c75aee7606e886d91c810bc491c9f40ff5837 (patch)
treeb8ab05276b686849a5916f93a63d8e44ce800f1e /drivers/net/igb/e1000_hw.h
parentigb: rename phy ops (diff)
downloadkernel-qcow2-linux-312c75aee7606e886d91c810bc491c9f40ff5837.tar.gz
kernel-qcow2-linux-312c75aee7606e886d91c810bc491c9f40ff5837.tar.xz
kernel-qcow2-linux-312c75aee7606e886d91c810bc491c9f40ff5837.zip
igb: rename nvm ops
All of the nvm ops have the tag _nvm added to the end which is redundant since all of the calls to the ops have to go through the nvm ops struct anyway. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/e1000_hw.h')
-rw-r--r--drivers/net/igb/e1000_hw.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index 5acb8497cd64..acb42a21e95c 100644
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
@@ -437,10 +437,10 @@ struct e1000_phy_operations {
};
struct e1000_nvm_operations {
- s32 (*acquire_nvm)(struct e1000_hw *);
- s32 (*read_nvm)(struct e1000_hw *, u16, u16, u16 *);
- void (*release_nvm)(struct e1000_hw *);
- s32 (*write_nvm)(struct e1000_hw *, u16, u16, u16 *);
+ s32 (*acquire)(struct e1000_hw *);
+ s32 (*read)(struct e1000_hw *, u16, u16, u16 *);
+ void (*release)(struct e1000_hw *);
+ s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
};
struct e1000_info {