* [PATCH net-next] net: phylink: use more linkmode_*
@ 2019-10-15 10:28 Russell King
2019-10-15 13:26 ` Andrew Lunn
2019-10-16 3:40 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Russell King @ 2019-10-15 10:28 UTC (permalink / raw)
To: Andrew Lunn, David S. Miller, Florian Fainelli, Heiner Kallweit; +Cc: netdev
Use more linkmode_* helpers rather than open-coding the bitmap
operations.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
drivers/net/phy/phylink.c | 7 ++-----
include/linux/linkmode.h | 6 ++++++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index a5a57ca94c1a..8e53ed90da3c 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -117,9 +117,7 @@ static int phylink_is_empty_linkmode(const unsigned long *linkmode)
phylink_set(tmp, Pause);
phylink_set(tmp, Asym_Pause);
- bitmap_andnot(tmp, linkmode, tmp, __ETHTOOL_LINK_MODE_MASK_NBITS);
-
- return linkmode_empty(tmp);
+ return linkmode_subset(linkmode, tmp);
}
static const char *phylink_an_mode_str(unsigned int mode)
@@ -1728,8 +1726,7 @@ static int phylink_sfp_module_insert(void *upstream,
if (phy_interface_mode_is_8023z(iface) && pl->phydev)
return -EINVAL;
- changed = !bitmap_equal(pl->supported, support,
- __ETHTOOL_LINK_MODE_MASK_NBITS);
+ changed = !linkmode_equal(pl->supported, support);
if (changed) {
linkmode_copy(pl->supported, support);
linkmode_copy(pl->link_config.advertising, config.advertising);
diff --git a/include/linux/linkmode.h b/include/linux/linkmode.h
index a99c58866860..fe740031339d 100644
--- a/include/linux/linkmode.h
+++ b/include/linux/linkmode.h
@@ -82,4 +82,10 @@ static inline int linkmode_equal(const unsigned long *src1,
return bitmap_equal(src1, src2, __ETHTOOL_LINK_MODE_MASK_NBITS);
}
+static inline int linkmode_subset(const unsigned long *src1,
+ const unsigned long *src2)
+{
+ return bitmap_subset(src1, src2, __ETHTOOL_LINK_MODE_MASK_NBITS);
+}
+
#endif /* __LINKMODE_H */
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] net: phylink: use more linkmode_*
2019-10-15 10:28 [PATCH net-next] net: phylink: use more linkmode_* Russell King
@ 2019-10-15 13:26 ` Andrew Lunn
2019-10-16 3:40 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Lunn @ 2019-10-15 13:26 UTC (permalink / raw)
To: Russell King; +Cc: David S. Miller, Florian Fainelli, Heiner Kallweit, netdev
On Tue, Oct 15, 2019 at 11:28:46AM +0100, Russell King wrote:
> Use more linkmode_* helpers rather than open-coding the bitmap
> operations.
>
> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] net: phylink: use more linkmode_*
2019-10-15 10:28 [PATCH net-next] net: phylink: use more linkmode_* Russell King
2019-10-15 13:26 ` Andrew Lunn
@ 2019-10-16 3:40 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2019-10-16 3:40 UTC (permalink / raw)
To: rmk+kernel; +Cc: andrew, f.fainelli, hkallweit1, netdev
From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Tue, 15 Oct 2019 11:28:46 +0100
> Use more linkmode_* helpers rather than open-coding the bitmap
> operations.
>
> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-16 3:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-15 10:28 [PATCH net-next] net: phylink: use more linkmode_* Russell King
2019-10-15 13:26 ` Andrew Lunn
2019-10-16 3:40 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).