Use min()/max() to reduce the code and improve its readability.
Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
---
drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
index e19bb0150cb5..ab1b952ff1fb 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
@@ -205,15 +205,10 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev,
resource_size_t map_addr;
/* Make a single overlapping BAR mapping */
- if (tx_bar_off < rx_bar_off)
- bar_off = tx_bar_off;
- else
- bar_off = rx_bar_off;
-
- if ((tx_bar_off + tx_bar_sz) > (rx_bar_off + rx_bar_sz))
- bar_sz = (tx_bar_off + tx_bar_sz) - bar_off;
- else
- bar_sz = (rx_bar_off + rx_bar_sz) - bar_off;
+ bar_off = min(tx_bar_off, rx_bar_off);
+
+ bar_sz = max(tx_bar_off + tx_bar_sz,
+ rx_bar_off + rx_bar_sz) - bar_off;
map_addr = pci_resource_start(pdev, tx_bar_no) + bar_off;
vf->q_bar = ioremap(map_addr, bar_sz);
--
2.34.1