* [PATCH net-next] net: phy: marvell: use phy_modify_changed() for marvell_set_polarity()
@ 2021-06-03 13:01 Russell King
2021-06-03 13:53 ` Andrew Lunn
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Russell King @ 2021-06-03 13:01 UTC (permalink / raw)
To: Andrew Lunn, Heiner Kallweit; +Cc: David S. Miller, netdev, Jakub Kicinski
Rather than open-coding the phy_modify_changed() sequence, use this
helper in marvell_set_polarity().
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
drivers/net/phy/marvell.c | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index e6721c1c26c2..23751d95855b 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -367,39 +367,24 @@ static irqreturn_t marvell_handle_interrupt(struct phy_device *phydev)
static int marvell_set_polarity(struct phy_device *phydev, int polarity)
{
- int reg;
- int err;
- int val;
-
- /* get the current settings */
- reg = phy_read(phydev, MII_M1011_PHY_SCR);
- if (reg < 0)
- return reg;
+ u16 val;
- val = reg;
- val &= ~MII_M1011_PHY_SCR_AUTO_CROSS;
switch (polarity) {
case ETH_TP_MDI:
- val |= MII_M1011_PHY_SCR_MDI;
+ val = MII_M1011_PHY_SCR_MDI;
break;
case ETH_TP_MDI_X:
- val |= MII_M1011_PHY_SCR_MDI_X;
+ val = MII_M1011_PHY_SCR_MDI_X;
break;
case ETH_TP_MDI_AUTO:
case ETH_TP_MDI_INVALID:
default:
- val |= MII_M1011_PHY_SCR_AUTO_CROSS;
+ val = MII_M1011_PHY_SCR_AUTO_CROSS;
break;
}
- if (val != reg) {
- /* Set the new polarity value in the register */
- err = phy_write(phydev, MII_M1011_PHY_SCR, val);
- if (err)
- return err;
- }
-
- return val != reg;
+ return phy_modify_changed(phydev, MII_M1011_PHY_SCR,
+ MII_M1011_PHY_SCR_AUTO_CROSS, val);
}
static int marvell_config_aneg(struct phy_device *phydev)
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: phy: marvell: use phy_modify_changed() for marvell_set_polarity()
2021-06-03 13:01 [PATCH net-next] net: phy: marvell: use phy_modify_changed() for marvell_set_polarity() Russell King
@ 2021-06-03 13:53 ` Andrew Lunn
2021-06-03 15:21 ` Marek Behún
2021-06-03 22:30 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Lunn @ 2021-06-03 13:53 UTC (permalink / raw)
To: Russell King; +Cc: Heiner Kallweit, David S. Miller, netdev, Jakub Kicinski
On Thu, Jun 03, 2021 at 02:01:10PM +0100, Russell King wrote:
> Rather than open-coding the phy_modify_changed() sequence, use this
> helper in marvell_set_polarity().
>
> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: phy: marvell: use phy_modify_changed() for marvell_set_polarity()
2021-06-03 13:01 [PATCH net-next] net: phy: marvell: use phy_modify_changed() for marvell_set_polarity() Russell King
2021-06-03 13:53 ` Andrew Lunn
@ 2021-06-03 15:21 ` Marek Behún
2021-06-03 22:30 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Marek Behún @ 2021-06-03 15:21 UTC (permalink / raw)
To: Russell King
Cc: Andrew Lunn, Heiner Kallweit, David S. Miller, netdev, Jakub Kicinski
On Thu, 03 Jun 2021 14:01:10 +0100
Russell King <rmk+kernel@armlinux.org.uk> wrote:
> Rather than open-coding the phy_modify_changed() sequence, use this
> helper in marvell_set_polarity().
>
> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Marek Behún <kabel@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: phy: marvell: use phy_modify_changed() for marvell_set_polarity()
2021-06-03 13:01 [PATCH net-next] net: phy: marvell: use phy_modify_changed() for marvell_set_polarity() Russell King
2021-06-03 13:53 ` Andrew Lunn
2021-06-03 15:21 ` Marek Behún
@ 2021-06-03 22:30 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-03 22:30 UTC (permalink / raw)
To: Russell King; +Cc: andrew, hkallweit1, davem, netdev, kuba
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
On Thu, 03 Jun 2021 14:01:10 +0100 you wrote:
> Rather than open-coding the phy_modify_changed() sequence, use this
> helper in marvell_set_polarity().
>
> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
> ---
> drivers/net/phy/marvell.c | 27 ++++++---------------------
> 1 file changed, 6 insertions(+), 21 deletions(-)
Here is the summary with links:
- [net-next] net: phy: marvell: use phy_modify_changed() for marvell_set_polarity()
https://git.kernel.org/netdev/net-next/c/feb938fad63f
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-03 22:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-03 13:01 [PATCH net-next] net: phy: marvell: use phy_modify_changed() for marvell_set_polarity() Russell King
2021-06-03 13:53 ` Andrew Lunn
2021-06-03 15:21 ` Marek Behún
2021-06-03 22:30 ` patchwork-bot+netdevbpf
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.