[v2] net: marvell: Use min() instead of doing it manually

[PATCH v2] net: marvell: Use min() instead of doing it manually

Posted by Haowen Bai 4 years, 3 months ago

Fix following coccicheck warning:
drivers/net/ethernet/marvell/mv643xx_eth.c:1664:35-36: WARNING opportunity for min()

Signed-off-by: Haowen Bai <baihaowen88@gmail.com>
---
 drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 143ca8b..e3e79cf 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1661,7 +1661,7 @@ mv643xx_eth_set_ringparam(struct net_device *dev, struct ethtool_ringparam *er,
 	if (er->rx_mini_pending || er->rx_jumbo_pending)
 		return -EINVAL;
 
-	mp->rx_ring_size = er->rx_pending < 4096 ? er->rx_pending : 4096;
+	mp->rx_ring_size = min(er->rx_pending, (unsigned)4096);
 	mp->tx_ring_size = clamp_t(unsigned int, er->tx_pending,
 				   MV643XX_MAX_SKB_DESCS * 2, 4096);
 	if (mp->tx_ring_size != er->tx_pending)
-- 
2.7.4

Re: [PATCH v2] net: marvell: Use min() instead of doing it manually

Posted by Heiner Kallweit 4 years, 3 months ago

On 02.03.2022 07:48, Haowen Bai wrote:
> Fix following coccicheck warning:
> drivers/net/ethernet/marvell/mv643xx_eth.c:1664:35-36: WARNING opportunity for min()
> 
> Signed-off-by: Haowen Bai <baihaowen88@gmail.com>
> ---
>  drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
> index 143ca8b..e3e79cf 100644
> --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
> +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
> @@ -1661,7 +1661,7 @@ mv643xx_eth_set_ringparam(struct net_device *dev, struct ethtool_ringparam *er,
>  	if (er->rx_mini_pending || er->rx_jumbo_pending)
>  		return -EINVAL;
>  
> -	mp->rx_ring_size = er->rx_pending < 4096 ? er->rx_pending : 4096;
> +	mp->rx_ring_size = min(er->rx_pending, (unsigned)4096);

Don't just use unsigned w/o int. Why not simply marking the constant as unsigned: 4096U ?
And again: You should at least compile-test it.

>  	mp->tx_ring_size = clamp_t(unsigned int, er->tx_pending,
>  				   MV643XX_MAX_SKB_DESCS * 2, 4096);
>  	if (mp->tx_ring_size != er->tx_pending)

Re: [PATCH v2] net: marvell: Use min() instead of doing it manually

Posted by lotte bai 4 years, 3 months ago

Yes, I have compiled at local, either unsigned and U is pass.  Thank
you for your kindly reminder.

Heiner Kallweit <hkallweit1@gmail.com> 于2022年3月2日周三 19:06写道：
>
> On 02.03.2022 07:48, Haowen Bai wrote:
> > Fix following coccicheck warning:
> > drivers/net/ethernet/marvell/mv643xx_eth.c:1664:35-36: WARNING opportunity for min()
> >
> > Signed-off-by: Haowen Bai <baihaowen88@gmail.com>
> > ---
> >  drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
> > index 143ca8b..e3e79cf 100644
> > --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
> > +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
> > @@ -1661,7 +1661,7 @@ mv643xx_eth_set_ringparam(struct net_device *dev, struct ethtool_ringparam *er,
> >       if (er->rx_mini_pending || er->rx_jumbo_pending)
> >               return -EINVAL;
> >
> > -     mp->rx_ring_size = er->rx_pending < 4096 ? er->rx_pending : 4096;
> > +     mp->rx_ring_size = min(er->rx_pending, (unsigned)4096);
>
> Don't just use unsigned w/o int. Why not simply marking the constant as unsigned: 4096U ?
> And again: You should at least compile-test it.
>
> >       mp->tx_ring_size = clamp_t(unsigned int, er->tx_pending,
> >                                  MV643XX_MAX_SKB_DESCS * 2, 4096);
> >       if (mp->tx_ring_size != er->tx_pending)
>