2 files changed, 2 insertions, 5 deletions

diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index ab837fdb2383..d3a6539a77cc 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -433,7 +433,6 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
         /* If a PE has both switch and other functions, show it as a switch */
         if (rio_is_switch(rdev)) {
                 rswitch = rdev->rswitch;
-                rswitch->switchid = rdev->comp_tag & RIO_CTAG_UDEVID;
                 rswitch->port_ok = 0;
                 spin_lock_init(&rswitch->lock);
                 rswitch->route_table = kzalloc(sizeof(u8)*
@@ -446,7 +445,7 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
                                 rdid++)
                         rswitch->route_table[rdid] = RIO_INVALID_ROUTE;
                 dev_set_name(&rdev->dev, "%02x:s:%04x", rdev->net->id,
-                             rswitch->switchid);
+                             rdev->comp_tag & RIO_CTAG_UDEVID);
 
                 if (do_enum)
                         rio_route_clr_table(rdev, RIO_GLOBAL_TABLE, 0);
@@ -459,7 +458,7 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
                         rio_enable_rx_tx_port(port, 0, destid, hopcount, 0);
 
                 dev_set_name(&rdev->dev, "%02x:e:%04x", rdev->net->id,
-                             rdev->destid);
+                             rdev->comp_tag & RIO_CTAG_UDEVID);
         }
 
         rio_attach_device(rdev);
diff --git a/include/linux/rio.h b/include/linux/rio.h
index e2faf7b8fe80..b71d5738e683 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -92,7 +92,6 @@ union rio_pw_msg;
 /**
  * struct rio_switch - RIO switch info
  * @node: Node in global list of switches
- * @switchid: Switch ID that is unique across a network
  * @route_table: Copy of switch routing table
  * @port_ok: Status of each port (one bit per port) - OK=1 or UNINIT=0
  * @ops: pointer to switch-specific operations
@@ -101,7 +100,6 @@ union rio_pw_msg;
  */
 struct rio_switch {
         struct list_head node;
-        u16 switchid;
         u8 *route_table;
         u32 port_ok;
         struct rio_switch_ops *ops;