From mboxrd@z Thu Jan 1 00:00:00 1970 From: Po-Yu Chuang Date: Fri, 21 Jan 2011 15:51:25 +0800 Subject: [U-Boot] [PATCH v2 2/2] net: ftmac100: update get_timer() usages In-Reply-To: <1295537003-1789-1-git-send-email-ratbert.chuang@gmail.com> References: <1295537003-1789-1-git-send-email-ratbert.chuang@gmail.com> Message-ID: <1295596285-1690-1-git-send-email-ratbert.chuang@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Po-Yu Chuang Use get_timer() the same way as drivers/net/ftgmac100.c Signed-off-by: Po-Yu Chuang --- v2: this patch is splitted from "net: ftmac100: remove unncessary volatiles" drivers/net/ftmac100.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 27381a3..94dc6d9 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -195,8 +195,8 @@ ftmac100_send (struct eth_device *dev, volatile void *packet, int length) { struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; struct ftmac100_data *priv = dev->priv; - int tmo; struct ftmac100_txdes *curr_des = priv->txdes; + ulong start; if (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) { debug ("%s(): no TX descriptor available\n", __func__); @@ -224,9 +224,9 @@ ftmac100_send (struct eth_device *dev, volatile void *packet, int length) /* wait for transfer to succeed */ - tmo = get_timer (0) + 5 * CONFIG_SYS_HZ; + start = get_timer(0); while (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) { - if (get_timer (0) >= tmo) { + if (get_timer(start) >= 5) { debug ("%s(): timed out\n", __func__); return -1; } -- 1.6.3.3