1 files changed, 22 insertions, 52 deletions

diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 7b5080c45569..c13289e10bb1 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -471,16 +471,9 @@ exit:
  */
 int rio_set_port_lockout(struct rio_dev *rdev, u32 pnum, int lock)
 {
-        u8 hopcount = 0xff;
-        u16 destid = rdev->destid;
         u32 regval;
 
-        if (rdev->rswitch) {
-                destid = rdev->rswitch->destid;
-                hopcount = rdev->rswitch->hopcount;
-        }
-
-        rio_mport_read_config_32(rdev->net->hport, destid, hopcount,
+        rio_read_config_32(rdev,
                                  rdev->phys_efptr + RIO_PORT_N_CTL_CSR(pnum),
                                  &regval);
         if (lock)
@@ -488,7 +481,7 @@ int rio_set_port_lockout(struct rio_dev *rdev, u32 pnum, int lock)
         else
                 regval &= ~RIO_PORT_N_CTL_LOCKOUT;
 
-        rio_mport_write_config_32(rdev->net->hport, destid, hopcount,
+        rio_write_config_32(rdev,
                                   rdev->phys_efptr + RIO_PORT_N_CTL_CSR(pnum),
                                   regval);
         return 0;
@@ -507,7 +500,7 @@ static int
 rio_chk_dev_route(struct rio_dev *rdev, struct rio_dev **nrdev, int *npnum)
 {
         u32 result;
-        int p_port, dstid, rc = -EIO;
+        int p_port, rc = -EIO;
         struct rio_dev *prev = NULL;
 
         /* Find switch with failed RIO link */
@@ -522,9 +515,7 @@ rio_chk_dev_route(struct rio_dev *rdev, struct rio_dev **nrdev, int *npnum)
         if (prev == NULL)
                 goto err_out;
 
-        dstid = (rdev->pef & RIO_PEF_SWITCH) ?
-                        rdev->rswitch->destid : rdev->destid;
-        p_port = prev->rswitch->route_table[dstid];
+        p_port = prev->rswitch->route_table[rdev->destid];
 
         if (p_port != RIO_INVALID_ROUTE) {
                 pr_debug("RIO: link failed on [%s]-P%d\n",
@@ -567,15 +558,8 @@ rio_mport_chk_dev_access(struct rio_mport *mport, u16 destid, u8 hopcount)
  */
 static int rio_chk_dev_access(struct rio_dev *rdev)
 {
-        u8 hopcount = 0xff;
-        u16 destid = rdev->destid;
-
-        if (rdev->rswitch) {
-                destid = rdev->rswitch->destid;
-                hopcount = rdev->rswitch->hopcount;
-        }
-
-        return rio_mport_chk_dev_access(rdev->net->hport, destid, hopcount);
+        return rio_mport_chk_dev_access(rdev->net->hport,
+                                        rdev->destid, rdev->hopcount);
 }
 
 /**
@@ -588,23 +572,20 @@ static int rio_chk_dev_access(struct rio_dev *rdev)
 static int
 rio_get_input_status(struct rio_dev *rdev, int pnum, u32 *lnkresp)
 {
-        struct rio_mport *mport = rdev->net->hport;
-        u16 destid = rdev->rswitch->destid;
-        u8 hopcount = rdev->rswitch->hopcount;
         u32 regval;
         int checkcount;
 
         if (lnkresp) {
                 /* Read from link maintenance response register
                  * to clear valid bit */
-                rio_mport_read_config_32(mport, destid, hopcount,
+                rio_read_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_N_MNT_RSP_CSR(pnum),
                         &regval);
                 udelay(50);
         }
 
         /* Issue Input-status command */
-        rio_mport_write_config_32(mport, destid, hopcount,
+        rio_write_config_32(rdev,
                 rdev->phys_efptr + RIO_PORT_N_MNT_REQ_CSR(pnum),
                 RIO_MNT_REQ_CMD_IS);
 
@@ -615,7 +596,7 @@ rio_get_input_status(struct rio_dev *rdev, int pnum, u32 *lnkresp)
         checkcount = 3;
         while (checkcount--) {
                 udelay(50);
-                rio_mport_read_config_32(mport, destid, hopcount,
+                rio_read_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_N_MNT_RSP_CSR(pnum),
                         &regval);
                 if (regval & RIO_PORT_N_MNT_RSP_RVAL) {
@@ -635,15 +616,12 @@ rio_get_input_status(struct rio_dev *rdev, int pnum, u32 *lnkresp)
  */
 static int rio_clr_err_stopped(struct rio_dev *rdev, u32 pnum, u32 err_status)
 {
-        struct rio_mport *mport = rdev->net->hport;
-        u16 destid = rdev->rswitch->destid;
-        u8 hopcount = rdev->rswitch->hopcount;
         struct rio_dev *nextdev = rdev->rswitch->nextdev[pnum];
         u32 regval;
         u32 far_ackid, far_linkstat, near_ackid;
 
         if (err_status == 0)
-                rio_mport_read_config_32(mport, destid, hopcount,
+                rio_read_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(pnum),
                         &err_status);
 
@@ -661,7 +639,7 @@ static int rio_clr_err_stopped(struct rio_dev *rdev, u32 pnum, u32 err_status)
                          pnum, regval);
                 far_ackid = (regval & RIO_PORT_N_MNT_RSP_ASTAT) >> 5;
                 far_linkstat = regval & RIO_PORT_N_MNT_RSP_LSTAT;
-                rio_mport_read_config_32(mport, destid, hopcount,
+                rio_read_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_N_ACK_STS_CSR(pnum),
                         &regval);
                 pr_debug("RIO_EM: SP%d_ACK_STS_CSR=0x%08x\n", pnum, regval);
@@ -679,9 +657,8 @@ static int rio_clr_err_stopped(struct rio_dev *rdev, u32 pnum, u32 err_status)
                         /* Align near outstanding/outbound ackIDs with
                          * far inbound.
                          */
-                        rio_mport_write_config_32(mport, destid,
-                                hopcount, rdev->phys_efptr +
-                                        RIO_PORT_N_ACK_STS_CSR(pnum),
+                        rio_write_config_32(rdev,
+                                rdev->phys_efptr + RIO_PORT_N_ACK_STS_CSR(pnum),
                                 (near_ackid << 24) |
                                         (far_ackid << 8) | far_ackid);
                         /* Align far outstanding/outbound ackIDs with
@@ -698,7 +675,7 @@ static int rio_clr_err_stopped(struct rio_dev *rdev, u32 pnum, u32 err_status)
                                 pr_debug("RIO_EM: Invalid nextdev pointer (NULL)\n");
                 }
 rd_err:
-                rio_mport_read_config_32(mport, destid, hopcount,
+                rio_read_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(pnum),
                         &err_status);
                 pr_debug("RIO_EM: SP%d_ERR_STS_CSR=0x%08x\n", pnum, err_status);
@@ -710,7 +687,7 @@ rd_err:
                                      RIO_GET_PORT_NUM(nextdev->swpinfo), NULL);
                 udelay(50);
 
-                rio_mport_read_config_32(mport, destid, hopcount,
+                rio_read_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(pnum),
                         &err_status);
                 pr_debug("RIO_EM: SP%d_ERR_STS_CSR=0x%08x\n", pnum, err_status);
@@ -730,9 +707,6 @@ rd_err:
 int rio_inb_pwrite_handler(union rio_pw_msg *pw_msg)
 {
         struct rio_dev *rdev;
-        struct rio_mport *mport;
-        u8 hopcount;
-        u16 destid;
         u32 err_status, em_perrdet, em_ltlerrdet;
         int rc, portnum;
 
@@ -800,17 +774,13 @@ int rio_inb_pwrite_handler(union rio_pw_msg *pw_msg)
                 return 0;
         }
 
-        mport = rdev->net->hport;
-        destid = rdev->rswitch->destid;
-        hopcount = rdev->rswitch->hopcount;
-
         /*
          * Process the port-write notification from switch
          */
         if (rdev->rswitch->em_handle)
                 rdev->rswitch->em_handle(rdev, portnum);
 
-        rio_mport_read_config_32(mport, destid, hopcount,
+        rio_read_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(portnum),
                         &err_status);
         pr_debug("RIO_PW: SP%d_ERR_STS_CSR=0x%08x\n", portnum, err_status);
@@ -840,7 +810,7 @@ int rio_inb_pwrite_handler(union rio_pw_msg *pw_msg)
                         rdev->rswitch->port_ok &= ~(1 << portnum);
                         rio_set_port_lockout(rdev, portnum, 1);
 
-                        rio_mport_write_config_32(mport, destid, hopcount,
+                        rio_write_config_32(rdev,
                                 rdev->phys_efptr +
                                         RIO_PORT_N_ACK_STS_CSR(portnum),
                                 RIO_PORT_N_ACK_CLEAR);
@@ -851,28 +821,28 @@ int rio_inb_pwrite_handler(union rio_pw_msg *pw_msg)
                 }
         }
 
-        rio_mport_read_config_32(mport, destid, hopcount,
+        rio_read_config_32(rdev,
                 rdev->em_efptr + RIO_EM_PN_ERR_DETECT(portnum), &em_perrdet);
         if (em_perrdet) {
                 pr_debug("RIO_PW: RIO_EM_P%d_ERR_DETECT=0x%08x\n",
                          portnum, em_perrdet);
                 /* Clear EM Port N Error Detect CSR */
-                rio_mport_write_config_32(mport, destid, hopcount,
+                rio_write_config_32(rdev,
                         rdev->em_efptr + RIO_EM_PN_ERR_DETECT(portnum), 0);
         }
 
-        rio_mport_read_config_32(mport, destid, hopcount,
+        rio_read_config_32(rdev,
                 rdev->em_efptr + RIO_EM_LTL_ERR_DETECT, &em_ltlerrdet);
         if (em_ltlerrdet) {
                 pr_debug("RIO_PW: RIO_EM_LTL_ERR_DETECT=0x%08x\n",
                          em_ltlerrdet);
                 /* Clear EM L/T Layer Error Detect CSR */
-                rio_mport_write_config_32(mport, destid, hopcount,
+                rio_write_config_32(rdev,
                         rdev->em_efptr + RIO_EM_LTL_ERR_DETECT, 0);
         }
 
         /* Clear remaining error bits and Port-Write Pending bit */
-        rio_mport_write_config_32(mport, destid, hopcount,
+        rio_write_config_32(rdev,
                         rdev->phys_efptr + RIO_PORT_N_ERR_STS_CSR(portnum),
                         err_status);