]> git.karo-electronics.de Git - linux-beck.git/commitdiff
net: 8390: use time_after() for time comparison
authorManuel Schölling <manuel.schoelling@gmx.de>
Sun, 18 May 2014 10:45:48 +0000 (12:45 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 19 May 2014 01:24:52 +0000 (21:24 -0400)
To be future-proof and for better readability the time comparisons are modified
to use time_after() instead of raw math.

Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/8390/ax88796.c

index 455d4c399b52168ce6f8691160991e500216ff54..1d162ccb473341af256279b29d466bc56429472b 100644 (file)
@@ -157,7 +157,7 @@ static void ax_reset_8390(struct net_device *dev)
 
        /* This check _should_not_ be necessary, omit eventually. */
        while ((ei_inb(addr + EN0_ISR) & ENISR_RESET) == 0) {
-               if (jiffies - reset_start_time > 2 * HZ / 100) {
+               if (time_after(jiffies, reset_start_time + 2 * HZ / 100)) {
                        netdev_warn(dev, "%s: did not complete.\n", __func__);
                        break;
                }
@@ -293,7 +293,7 @@ static void ax_block_output(struct net_device *dev, int count,
        dma_start = jiffies;
 
        while ((ei_inb(nic_base + EN0_ISR) & ENISR_RDC) == 0) {
-               if (jiffies - dma_start > 2 * HZ / 100) {               /* 20ms */
+               if (time_after(jiffies, dma_start + 2 * HZ / 100)) { /* 20ms */
                        netdev_warn(dev, "timeout waiting for Tx RDC.\n");
                        ax_reset_8390(dev);
                        ax_NS8390_init(dev, 1);