| Message ID | 20240829031906.1907025-1-yanzhen@vivo.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,net-next] ethernet: marvell: Use min macro | expand |
On Thu, Aug 29, 2024 at 11:19:06AM +0800, Yan Zhen wrote: > Using the real macro is usually more intuitive and readable, > When the original file is guaranteed to contain the minmax.h header file > and compile correctly. > > Signed-off-by: Yan Zhen <yanzhen@vivo.com> > --- > > Changes in v2: > - Rewrite the subject. > - Using umin() instead of min(). Sorry for not noticing this in my review of v1, but, looking at git history, I think the prefix for the subject of this patch should be "net: mvneta: " rather than "ethernet: " Subject: net: mvneta: ...
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index d72b2d5f96db..08d277165f40 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -4750,8 +4750,7 @@ mvneta_ethtool_set_ringparam(struct net_device *dev, if ((ring->rx_pending == 0) || (ring->tx_pending == 0)) return -EINVAL; - pp->rx_ring_size = ring->rx_pending < MVNETA_MAX_RXD ? - ring->rx_pending : MVNETA_MAX_RXD; + pp->rx_ring_size = umin(ring->rx_pending, MVNETA_MAX_RXD); pp->tx_ring_size = clamp_t(u16, ring->tx_pending, MVNETA_MAX_SKB_DESCS * 2, MVNETA_MAX_TXD);
Using the real macro is usually more intuitive and readable, When the original file is guaranteed to contain the minmax.h header file and compile correctly. Signed-off-by: Yan Zhen <yanzhen@vivo.com> --- Changes in v2: - Rewrite the subject. - Using umin() instead of min(). drivers/net/ethernet/marvell/mvneta.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)