1 files changed, 7 insertions, 18 deletions

diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
index 363b6cbcd0b3..1b56b4ac7fb2 100644
--- a/drivers/firewire/fw-topology.h
+++ b/drivers/firewire/fw-topology.h
@@ -20,12 +20,6 @@
 #define __fw_topology_h
 
 enum {
-        FW_TOPOLOGY_A =         0x01,
-        FW_TOPOLOGY_B =         0x02,
-        FW_TOPOLOGY_MIXED =     0x03,
-};
-
-enum {
         FW_NODE_CREATED =   0x00,
         FW_NODE_UPDATED =   0x01,
         FW_NODE_DESTROYED = 0x02,
@@ -33,21 +27,16 @@ enum {
         FW_NODE_LINK_OFF =  0x04,
 };
 
-struct fw_port {
-        struct fw_node *node;
-        unsigned speed : 3; /* S100, S200, ... S3200 */
-};
-
 struct fw_node {
         u16 node_id;
         u8 color;
         u8 port_count;
-        unsigned link_on : 1;
-        unsigned initiated_reset : 1;
-        unsigned b_path : 1;
-        u8 phy_speed : 3; /* As in the self ID packet. */
-        u8 max_speed : 5; /* Minimum of all phy-speeds and port speeds on
-                           * the path from the local node to this node. */
+        u8 link_on : 1;
+        u8 initiated_reset : 1;
+        u8 b_path : 1;
+        u8 phy_speed : 2; /* As in the self ID packet. */
+        u8 max_speed : 2; /* Minimum of all phy-speeds on the path from the
+                           * local node to this node. */
         u8 max_depth : 4; /* Maximum depth to any leaf node */
         u8 max_hops : 4;  /* Max hops in this sub tree */
         atomic_t ref_count;
@@ -58,7 +47,7 @@ struct fw_node {
         /* Upper layer specific data. */
         void *data;
 
-        struct fw_port ports[0];
+        struct fw_node *ports[0];
 };
 
 static inline struct fw_node *