From: Leif Lindholm <leif.lindholm@linaro.org>
To: Marcin Wojtas <mw@semihalf.com>
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
Subject: Re: [platforms: PATCH v2 4/4] Marvell/Drivers: MvPhyDxe: Cleanup the header
Date: Mon, 4 Dec 2017 14:00:29 +0000 [thread overview]
Message-ID: <20171204140029.yvfn5s7wos7dgyjh@bivouac.eciton.net> (raw)
In-Reply-To: <1512142507-23282-5-git-send-email-mw@semihalf.com>
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 <mw@semihalf.com>
> ---
> 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
next prev parent reply other threads:[~2017-12-04 13:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-01 15:35 [platforms: PATCH v2 0/4] Armada 7k/8k - misc improvements pt.3 Marcin Wojtas
2017-12-01 15:35 ` [platforms: PATCH v2 1/4] Marvell/Armada: Switch to dynamic tftp command Marcin Wojtas
2017-12-04 13:32 ` Leif Lindholm
2017-12-04 15:04 ` Marcin Wojtas
2017-12-01 15:35 ` [platforms: PATCH v2 2/4] Marvell/Armada: Fix watchdog control base Marcin Wojtas
2017-12-01 15:35 ` [platforms: PATCH v2 3/4] Marvell/Applications: FirmwareUpdate: Fix usage information Marcin Wojtas
2017-12-04 13:52 ` Leif Lindholm
2017-12-04 15:15 ` Marcin Wojtas
2017-12-01 15:35 ` [platforms: PATCH v2 4/4] Marvell/Drivers: MvPhyDxe: Cleanup the header Marcin Wojtas
2017-12-04 14:00 ` Leif Lindholm [this message]
2017-12-04 15:22 ` Marcin Wojtas
2017-12-04 16:10 ` Leif Lindholm
2017-12-04 16:35 ` Marcin Wojtas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171204140029.yvfn5s7wos7dgyjh@bivouac.eciton.net \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox