summaryrefslogtreecommitdiff
path: root/drivers/net/skge.h
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2005-06-27 22:33:06 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-28 02:05:05 +0400
commit981d0377d94f4d611f1c73429c0c32b35b56855f (patch)
tree446c1b69466cbee2fabeba448df604a582646c18 /drivers/net/skge.h
parent467b3417f9985b9a83ccebef2d4e07e3e8a9495e (diff)
downloadlinux-981d0377d94f4d611f1c73429c0c32b35b56855f.tar.xz
[PATCH] skge: replace chip_rev() accessor
Replace inline accessor functions for chip revision and number of ports with simple structure members. Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Diffstat (limited to 'drivers/net/skge.h')
-rw-r--r--drivers/net/skge.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 2669b80b2de8..e57a535c5c47 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -2793,11 +2793,12 @@ struct skge_hw {
u32 intr_mask;
struct net_device *dev[2];
- u8 mac_cfg;
u8 chip_id;
+ u8 chip_rev;
u8 phy_type;
u8 pmd_type;
u16 phy_addr;
+ u8 ports;
u32 ram_size;
u32 ram_offset;
@@ -2806,15 +2807,6 @@ struct skge_hw {
spinlock_t phy_lock;
};
-static inline int isdualport(const struct skge_hw *hw)
-{
- return !(hw->mac_cfg & CFG_SNG_MAC);
-}
-
-static inline u8 chip_rev(const struct skge_hw *hw)
-{
- return (hw->mac_cfg & CFG_CHIP_R_MSK) >> 4;
-}
static inline int iscopper(const struct skge_hw *hw)
{