aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Schölling <manuel.schoelling@gmx.de>2014-05-22 15:10:28 -0400
committerDavid S. Miller <davem@davemloft.net>2014-05-22 15:50:13 -0400
commit3aeea53f0a372a8adbfc150b37319bff3d24fd04 (patch)
tree1aa3221d025d3da4af1ce79f87c3673b4d7a02a9
parent05e1e76e0f736cba6094425ba20a3eea6dc23b99 (diff)
xilinx: Use time_before_eq()
To be future-proof and for better readability the time comparisons are modified to use time_before_eq() instead of plain, error-prone math. Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/xilinx/ll_temac_main.c2
-rw-r--r--drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c2
-rw-r--r--drivers/net/ethernet/xilinx/xilinx_emaclite.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index fa193c4688da..4ef818a7a6c6 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -75,7 +75,7 @@ int temac_indirect_busywait(struct temac_local *lp)
75 long end = jiffies + 2; 75 long end = jiffies + 2;
76 76
77 while (!(temac_ior(lp, XTE_RDY0_OFFSET) & XTE_RDY0_HARD_ACS_RDY_MASK)) { 77 while (!(temac_ior(lp, XTE_RDY0_OFFSET) & XTE_RDY0_HARD_ACS_RDY_MASK)) {
78 if (end - jiffies <= 0) { 78 if (time_before_eq(end, jiffies)) {
79 WARN_ON(1); 79 WARN_ON(1);
80 return -ETIMEDOUT; 80 return -ETIMEDOUT;
81 } 81 }
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
index 64b4639f43b6..d4abf478e2bb 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -22,7 +22,7 @@ int axienet_mdio_wait_until_ready(struct axienet_local *lp)
22 long end = jiffies + 2; 22 long end = jiffies + 2;
23 while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) & 23 while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) &
24 XAE_MDIO_MCR_READY_MASK)) { 24 XAE_MDIO_MCR_READY_MASK)) {
25 if (end - jiffies <= 0) { 25 if (time_before_eq(end, jiffies)) {
26 WARN_ON(1); 26 WARN_ON(1);
27 return -ETIMEDOUT; 27 return -ETIMEDOUT;
28 } 28 }
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 0d87c67a5ff7..8c4aed3053eb 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -702,7 +702,7 @@ static int xemaclite_mdio_wait(struct net_local *lp)
702 */ 702 */
703 while (__raw_readl(lp->base_addr + XEL_MDIOCTRL_OFFSET) & 703 while (__raw_readl(lp->base_addr + XEL_MDIOCTRL_OFFSET) &
704 XEL_MDIOCTRL_MDIOSTS_MASK) { 704 XEL_MDIOCTRL_MDIOSTS_MASK) {
705 if (end - jiffies <= 0) { 705 if (time_before_eq(end, jiffies)) {
706 WARN_ON(1); 706 WARN_ON(1);
707 return -ETIMEDOUT; 707 return -ETIMEDOUT;
708 } 708 }