Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aeea53f authored May 22, 2014 by Manuel Schölling Committed by David S. Miller May 22, 2014

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>

parent 05e1e76e

drivers/net/ethernet/xilinx/ll_temac_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ int temac_indirect_busywait(struct temac_local *lp)
		long end = jiffies + 2;

		while (!(temac_ior(lp, XTE_RDY0_OFFSET) & XTE_RDY0_HARD_ACS_RDY_MASK)) {
		if (end - jiffies <= 0) {
		if (time_before_eq(end, jiffies)) {
		WARN_ON(1);
		return -ETIMEDOUT;
		}

drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ int axienet_mdio_wait_until_ready(struct axienet_local *lp)
		long end = jiffies + 2;
		while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) &
		XAE_MDIO_MCR_READY_MASK)) {
		if (end - jiffies <= 0) {
		if (time_before_eq(end, jiffies)) {
		WARN_ON(1);
		return -ETIMEDOUT;
		}

drivers/net/ethernet/xilinx/xilinx_emaclite.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -702,7 +702,7 @@ static int xemaclite_mdio_wait(struct net_local *lp)
		*/
		while (__raw_readl(lp->base_addr + XEL_MDIOCTRL_OFFSET) &
		XEL_MDIOCTRL_MDIOSTS_MASK) {
		if (end - jiffies <= 0) {
		if (time_before_eq(end, jiffies)) {
		WARN_ON(1);
		return -ETIMEDOUT;
		}