From: Ramon Fried <rfried.dev@gmail.com>
To: "Marek Behún" <kabel@kernel.org>
Cc: "Stefan Roese" <sr@denx.de>,
"Robert Marko" <robert.marko@sartura.hr>,
"Pali Rohár" <pali@kernel.org>,
U-Boot-Denx <u-boot@lists.denx.de>,
"Joe Hershberger" <joe.hershberger@ni.com>,
"Marek Behún" <marek.behun@nic.cz>
Subject: Re: [PATCH u-boot-marvell 10/19] net: mvneta: Drop one indentation level in mvneta_adjust_link()
Date: Sun, 1 May 2022 02:29:48 +0300 [thread overview]
Message-ID: <CAGi-RUKFDKMHjjy=S-e51Hav9irJsHYGQUxTc7x7vU0FC2jbyA@mail.gmail.com> (raw)
In-Reply-To: <20220427104202.1205-11-kabel@kernel.org>
On Wed, Apr 27, 2022 at 1:42 PM Marek Behún <kabel@kernel.org> wrote:
>
> From: Marek Behún <marek.behun@nic.cz>
>
> Drop one indentation level in the mvneta_adjust_link() function.
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> ---
> drivers/net/mvneta.c | 38 ++++++++++++++++++--------------------
> 1 file changed, 18 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
> index 72789fc5c6..66d5e10174 100644
> --- a/drivers/net/mvneta.c
> +++ b/drivers/net/mvneta.c
> @@ -1161,31 +1161,29 @@ static void mvneta_adjust_link(struct udevice *dev)
> return;
> }
>
> - if (phydev->link) {
> - if ((pp->speed != phydev->speed) ||
> - (pp->duplex != phydev->duplex)) {
> - u32 val;
> + if (phydev->link &&
> + (pp->speed != phydev->speed || pp->duplex != phydev->duplex)) {
> + u32 val;
>
> - val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);
> - val &= ~(MVNETA_GMAC_CONFIG_MII_SPEED |
> - MVNETA_GMAC_CONFIG_GMII_SPEED |
> - MVNETA_GMAC_CONFIG_FULL_DUPLEX |
> - MVNETA_GMAC_AN_SPEED_EN |
> - MVNETA_GMAC_AN_DUPLEX_EN);
> + val = mvreg_read(pp, MVNETA_GMAC_AUTONEG_CONFIG);
> + val &= ~(MVNETA_GMAC_CONFIG_MII_SPEED |
> + MVNETA_GMAC_CONFIG_GMII_SPEED |
> + MVNETA_GMAC_CONFIG_FULL_DUPLEX |
> + MVNETA_GMAC_AN_SPEED_EN |
> + MVNETA_GMAC_AN_DUPLEX_EN);
>
> - if (phydev->duplex)
> - val |= MVNETA_GMAC_CONFIG_FULL_DUPLEX;
> + if (phydev->duplex)
> + val |= MVNETA_GMAC_CONFIG_FULL_DUPLEX;
>
> - if (phydev->speed == SPEED_1000)
> - val |= MVNETA_GMAC_CONFIG_GMII_SPEED;
> - else if (pp->speed == SPEED_100)
> - val |= MVNETA_GMAC_CONFIG_MII_SPEED;
> + if (phydev->speed == SPEED_1000)
> + val |= MVNETA_GMAC_CONFIG_GMII_SPEED;
> + else if (pp->speed == SPEED_100)
> + val |= MVNETA_GMAC_CONFIG_MII_SPEED;
>
> - mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
> + mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
>
> - pp->duplex = phydev->duplex;
> - pp->speed = phydev->speed;
> - }
> + pp->duplex = phydev->duplex;
> + pp->speed = phydev->speed;
> }
>
> if (phydev->link != pp->link) {
> --
> 2.35.1
>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
next prev parent reply other threads:[~2022-04-30 23:30 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-27 10:41 [PATCH u-boot-marvell 00/19] some mvneta changes, cleanups, fixes Marek Behún
2022-04-27 10:41 ` [PATCH u-boot-marvell 01/19] net: mvneta: Get rid of platdata Marek Behún
2022-04-30 23:28 ` Ramon Fried
2022-05-02 6:48 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 02/19] net: mvneta: Fix 10Mbps speed Marek Behún
2022-04-30 23:28 ` Ramon Fried
2022-05-02 6:48 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 03/19] net: mvneta: Use DM MDIO API for connecting PHY Marek Behún
2022-04-30 23:28 ` Ramon Fried
2022-05-02 6:48 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 04/19] net: mvneta: Remember fixed link instead of PHY address in priv data Marek Behún
2022-04-30 23:28 ` Ramon Fried
2022-05-02 6:48 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 05/19] arm: mvebu: Espressobin: Use DM registered MDIO to configure switch Marek Behún
2022-05-02 6:48 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 06/19] net: mdio-uclass: add dm_phy_find_by_ofnode() helper Marek Behún
2022-04-30 23:28 ` Ramon Fried
2022-05-02 7:00 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 07/19] arm: mvebu: turris_mox: Use DM registered MDIO Marek Behún
2022-05-02 7:00 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 08/19] net: mvneta: Don't register MDIO bus Marek Behún
2022-04-30 23:29 ` Ramon Fried
2022-05-02 7:01 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 09/19] net: mvneta: Fix unused variable warning if DM_GPIO is disabled Marek Behún
2022-04-30 23:29 ` Ramon Fried
2022-05-02 7:01 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 10/19] net: mvneta: Drop one indentation level in mvneta_adjust_link() Marek Behún
2022-04-30 23:29 ` Ramon Fried [this message]
2022-05-02 7:01 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 11/19] net: mvneta: Use bool instead of int for boolean variable Marek Behún
2022-04-30 23:29 ` Ramon Fried
2022-05-02 7:01 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 12/19] net: mvneta: Drop unnecessary space Marek Behún
2022-04-30 23:30 ` Ramon Fried
2022-05-02 7:01 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 13/19] net: mvneta: Don't check for CONFIG_PHYLIB Marek Behún
2022-04-30 23:30 ` Ramon Fried
2022-05-02 7:02 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 14/19] net: mvneta: Rename CONFIG_NR_CPUS to MVNETA_NR_CPUS Marek Behún
2022-04-30 23:30 ` Ramon Fried
2022-05-02 7:02 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 15/19] net: mvneta: Convert to use PHY_FIXED for fixed-link Marek Behún
2022-04-30 23:31 ` Ramon Fried
2022-05-02 7:02 ` Stefan Roese
2022-04-27 10:41 ` [PATCH u-boot-marvell 16/19] net: mvneta: Write PHY address just before enabling HW polling Marek Behún
2022-04-30 23:31 ` Ramon Fried
2022-05-02 7:03 ` Stefan Roese
2022-04-27 10:42 ` [PATCH u-boot-marvell 17/19] net: mvneta: Drop fixed_link member from private struct Marek Behún
2022-04-30 23:31 ` Ramon Fried
2022-05-02 7:03 ` Stefan Roese
2022-04-27 10:42 ` [PATCH u-boot-marvell 18/19] net: mvneta: Disable fixed PHY code if PHY_FIXED is not compiled in Marek Behún
2022-04-30 23:32 ` Ramon Fried
2022-05-02 7:03 ` Stefan Roese
2022-04-27 10:42 ` [PATCH u-boot-marvell 19/19] net: mvneta: Drop unneeded macro Marek Behún
2022-04-30 23:32 ` Ramon Fried
2022-05-02 7:03 ` Stefan Roese
2022-05-02 5:39 ` [PATCH u-boot-marvell 00/19] some mvneta changes, cleanups, fixes Stefan Roese
2022-05-04 9:25 ` Stefan Roese
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-all 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='CAGi-RUKFDKMHjjy=S-e51Hav9irJsHYGQUxTc7x7vU0FC2jbyA@mail.gmail.com' \
--to=rfried.dev@gmail.com \
--cc=joe.hershberger@ni.com \
--cc=kabel@kernel.org \
--cc=marek.behun@nic.cz \
--cc=pali@kernel.org \
--cc=robert.marko@sartura.hr \
--cc=sr@denx.de \
--cc=u-boot@lists.denx.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.