[PATCH] skge: fibre vs copper detection cleanup

Cleanup the code that handles fibre vs copper detection.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

 drivers/net/skge.c |   26 ++++++++++++--------------
 drivers/net/skge.h |   11 ++---------
 2 files changed, 14 insertions(+), 23 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

1 files changed, 2 insertions, 9 deletions

diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 636729fcbbaa..f1680beb8e68 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -2460,24 +2460,17 @@ struct skge_hw {
 
         u8                   chip_id;
         u8                   chip_rev;
-        u8                   phy_type;
-        u8                   pmd_type;
-        u16                  phy_addr;
+        u8                   copper;
         u8                   ports;
 
         u32                  ram_size;
         u32                  ram_offset;
+        u16                  phy_addr;
 
         struct tasklet_struct ext_tasklet;
         spinlock_t           phy_lock;
 };
 
-
-static inline int iscopper(const struct skge_hw *hw)
-{
-        return (hw->pmd_type == 'T');
-}
-
 enum {
         FLOW_MODE_NONE          = 0, /* No Flow-Control */
         FLOW_MODE_LOC_SEND      = 1, /* Local station sends PAUSE */