Instead of using the max() implementation of
the ternary operator, use real macros.

Signed-off-by: Yang Ruibin <11162571@vivo.com>
---
 drivers/net/ethernet/atheros/atlx/atl2.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index fa9a4919f..3ff669e72 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -2971,10 +2971,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)
 #endif
 	/* init RXD Flow control value */
 	adapter->hw.fc_rxd_hi = (adapter->rxd_ring_size / 8) * 7;
-	adapter->hw.fc_rxd_lo = (ATL2_MIN_RXD_COUNT / 8) >
-		(adapter->rxd_ring_size / 12) ? (ATL2_MIN_RXD_COUNT / 8) :
-		(adapter->rxd_ring_size / 12);
-
+	adapter->hw.fc_rxd_lo = max(ATL2_MIN_RXD_COUNT / 8, adapter->rxd_ring_size / 12);
 	/* Interrupt Moderate Timer */
 	opt.type = range_option;
 	opt.name = "Interrupt Moderate Timer";
-- 
2.34.1

Sorry, please ignore this patch.
Because the corresponding header file is not included, there may be 
compilation errors.

在 2024/8/22 15:50, Yang Ruibin 写道:
> Instead of using the max() implementation of
> the ternary operator, use real macros.
>
> Signed-off-by: Yang Ruibin <11162571@vivo.com>
> ---
>   drivers/net/ethernet/atheros/atlx/atl2.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
> index fa9a4919f..3ff669e72 100644
> --- a/drivers/net/ethernet/atheros/atlx/atl2.c
> +++ b/drivers/net/ethernet/atheros/atlx/atl2.c
> @@ -2971,10 +2971,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)
>   #endif
>   	/* init RXD Flow control value */
>   	adapter->hw.fc_rxd_hi = (adapter->rxd_ring_size / 8) * 7;
> -	adapter->hw.fc_rxd_lo = (ATL2_MIN_RXD_COUNT / 8) >
> -		(adapter->rxd_ring_size / 12) ? (ATL2_MIN_RXD_COUNT / 8) :
> -		(adapter->rxd_ring_size / 12);
> -
> +	adapter->hw.fc_rxd_lo = max(ATL2_MIN_RXD_COUNT / 8, adapter->rxd_ring_size / 12);
>   	/* Interrupt Moderate Timer */
>   	opt.type = range_option;
>   	opt.name = "Interrupt Moderate Timer";

On Thu, Aug 22, 2024 at 05:40:28PM +0800, Yang Ruibin wrote:
> Sorry, please ignore this patch.
> Because the corresponding header file is not included, there may be
> compilation errors.

Hi Yang Ruibin,

Thanks for your patch.

Some feedback from a process point of view, for future reference.

1. Please do not top-post in emails to Kernel mailing lists.

2. As a Networking patch, that is not a bug fix, it should
   be explicitly targeted at net-next.

   Subject: [PATCH net-next] ...

3. Looking at git history, it looks like 'net: atheros: ' would be an
   appropriate prefix for this patch.

   Subject: [PATCH net-next] net: atheros: ...

Please consider reading
https://docs.kernel.org/process/maintainer-netdev.html

And please, if you do post a new version, allow 24h to pass since the you
posted this version (as described in the link above).

> 
> 在 2024/8/22 15:50, Yang Ruibin 写道:
> > Instead of using the max() implementation of
> > the ternary operator, use real macros.
> > 
> > Signed-off-by: Yang Ruibin <11162571@vivo.com>
> > ---
> >   drivers/net/ethernet/atheros/atlx/atl2.c | 5 +----
> >   1 file changed, 1 insertion(+), 4 deletions(-)
> > 
> > diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
> > index fa9a4919f..3ff669e72 100644
> > --- a/drivers/net/ethernet/atheros/atlx/atl2.c
> > +++ b/drivers/net/ethernet/atheros/atlx/atl2.c
> > @@ -2971,10 +2971,7 @@ static void atl2_check_options(struct atl2_adapter *adapter)
> >   #endif
> >   	/* init RXD Flow control value */
> >   	adapter->hw.fc_rxd_hi = (adapter->rxd_ring_size / 8) * 7;
> > -	adapter->hw.fc_rxd_lo = (ATL2_MIN_RXD_COUNT / 8) >
> > -		(adapter->rxd_ring_size / 12) ? (ATL2_MIN_RXD_COUNT / 8) :
> > -		(adapter->rxd_ring_size / 12);
> > -
> > +	adapter->hw.fc_rxd_lo = max(ATL2_MIN_RXD_COUNT / 8, adapter->rxd_ring_size / 12);

Networking code still prefers lines to be 80 colimns wide or less.
In this case, I would suggest:

	adapter->hw.fc_rxd_lo = max(ATL2_MIN_RXD_COUNT / 8,
				    adapter->rxd_ring_size / 12);

> >   	/* Interrupt Moderate Timer */
> >   	opt.type = range_option;
> >   	opt.name = "Interrupt Moderate Timer";
>