From b7c9126750a2cea7173af170de1093e1c7b2651a Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Wed, 21 Mar 2012 12:18:44 +0100 Subject: net: miidev: Refactor timeout for aneg First check the status at least once, then do timeout checks. Minor cleanups also. Signed-off-by: Wolfram Sang Signed-off-by: Sascha Hauer --- drivers/net/miidev.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'drivers') diff --git a/drivers/net/miidev.c b/drivers/net/miidev.c index 83b6fe9ceb..16a3461d45 100644 --- a/drivers/net/miidev.c +++ b/drivers/net/miidev.c @@ -91,27 +91,22 @@ int miidev_restart_aneg(struct mii_device *mdev) int miidev_wait_aneg(struct mii_device *mdev) { - uint64_t start; int status; + uint64_t start = get_time_ns(); if (mdev->flags & MIIDEV_FORCE_LINK) return 0; - /* - * Wait for AN completion - */ - start = get_time_ns(); do { + status = mii_read(mdev, mdev->address, MII_BMSR); + if (status < 0) + return status; + if (is_timeout(start, 5 * SECOND)) { printf("%s: Autonegotiation timeout\n", mdev->cdev.name); - return -1; + return -ETIMEDOUT; } - status = mii_read(mdev, mdev->address, MII_BMSR); - if (status < 0) { - printf("%s: Autonegotiation failed. status: 0x%04x\n", mdev->cdev.name, status); - return -1; - } } while (!(status & BMSR_LSTATUS)); return 0; -- cgit v1.2.3