From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::244; helo=mail-wm0-x244.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9CAC422152381 for ; Mon, 4 Dec 2017 05:56:03 -0800 (PST) Received: by mail-wm0-x244.google.com with SMTP id g75so6023535wme.0 for ; Mon, 04 Dec 2017 06:00:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=Kk+Wbrg9rkOyGraIHxZtT/P1Ak4oZR28Iews71mpod0=; b=W/4vbBM7N19yY6PwhORe6TStAnDRIQmIGRC/a6rRsP2RrF7xGX+DOMHYBeUGxCih3t xQoTmY9naG1aq61gc0fo/FM8ESwilAiOMvB3wV1Nzop/MTrLyVpS6cHjXrr3esyBlwcz Sinnpl/WXzUlvSnO4jVAFgEX/FtEuzjrVpjWQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=Kk+Wbrg9rkOyGraIHxZtT/P1Ak4oZR28Iews71mpod0=; b=iMueZnOICdGsIPGVhZmwvBa992tr+e4NUcaPPR4VCN4Ssi94+KCi81Yha0arRDW8Ug eCnLvWlRUkyPHc75dcGnusaYTbR6E9h9Lbfk9JtDPFLpM2QQHFEluClgOo1l3/dlNIwI FlqyPCSUVuseG3ow9ODnxwy6DOP0G2pgAdj+wIrnJRinoUJwuyo46mtXi2ZiFggln1pP lAjQ4UbEmTo911AqT/QzO+Jn9HTPvxR9wp0J0VPDx2y1RMFhzlugfyE++0J+fx6heKcT SLLmecyh5SqlPEtJZmy+qs/5C/YW63RWdSl3jerRD/Z/RncfJG8oYJSMCbfOc/N0rYm+ Oovg== X-Gm-Message-State: AKGB3mKRv67OGmY33bdxAlamsP/4MwsXZKnolIEFQz90Pgad6pZEQeot utPAP2qkQvf0Ug+/mE7acAP2+X+vfvE= X-Google-Smtp-Source: AGs4zMbhLcnhBVKvEFxUwtbLBTyyhQnrE8SgrUncolRlJw15OXDLAWSKqpDa0Jr1uKNjqB1EI+pj9Q== X-Received: by 10.28.66.11 with SMTP id p11mr3319965wma.114.1512396032091; Mon, 04 Dec 2017 06:00:32 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id h76sm4324979wmd.2.2017.12.04.06.00.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Dec 2017 06:00:31 -0800 (PST) Date: Mon, 4 Dec 2017 14:00:29 +0000 From: Leif Lindholm To: Marcin Wojtas Cc: edk2-devel@lists.01.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, neta@marvell.com, kostap@marvell.com, jinghua@marvell.com, jsd@semihalf.com Message-ID: <20171204140029.yvfn5s7wos7dgyjh@bivouac.eciton.net> References: <1512142507-23282-1-git-send-email-mw@semihalf.com> <1512142507-23282-5-git-send-email-mw@semihalf.com> MIME-Version: 1.0 In-Reply-To: <1512142507-23282-5-git-send-email-mw@semihalf.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [platforms: PATCH v2 4/4] Marvell/Drivers: MvPhyDxe: Cleanup the header X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2017 13:56:03 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Dec 01, 2017 at 04:35:07PM +0100, Marcin Wojtas wrote: > This patch removes unused macros defined in MvPhyDxe.h, as well > as improves the style and comments. Pick single definition > of the autonegotiation timeout - two different macros were used > for the same purpose. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Marcin Wojtas > --- > Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c | 2 +- > Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.h | 152 ++++---------------- > 2 files changed, 31 insertions(+), 123 deletions(-) > > diff --git a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c b/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c > index e776a91..dd2edae 100644 > --- a/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c > +++ b/Platform/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.c > @@ -328,7 +328,7 @@ MvPhyInit1512 ( > > DEBUG((DEBUG_ERROR, "MvPhyDxe: Waiting for PHY auto negotiation... ")); > for (i = 0; !(Data & BMSR_ANEGCOMPLETE); i++) { > - if (i > PHY_ANEG_TIMEOUT) { > + if (i > PHY_AUTONEGOTIATE_TIMEOUT) { I think you've had a git accident somewhere: The existing line upstream is still if (i > PHY_AUTONEGOTIATE_TIMEOUT) { This hunk should have just dropped out. / Leif