[3/4] net/txgbe: remove port representor

Message ID 20210425080347.20376-4-jiawenwu@trustnetic.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers
Series Fixes for txgbe |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Jiawen Wu April 25, 2021, 8:03 a.m. UTC
  Remove port representor in device probe process.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev.c | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)
  

Comments

Ferruh Yigit April 27, 2021, 4:46 p.m. UTC | #1
On 4/25/2021 9:03 AM, Jiawen Wu wrote:
> Remove port representor in device probe process.
> 

It can be good to highlight that is because port representor is not supported by
the driver.

> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
> ---
>  drivers/net/txgbe/txgbe_ethdev.c | 21 ++-------------------
>  1 file changed, 2 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
> index 87c041c2ec..afb25fb8a0 100644
> --- a/drivers/net/txgbe/txgbe_ethdev.c
> +++ b/drivers/net/txgbe/txgbe_ethdev.c
> @@ -930,32 +930,15 @@ static int
>  eth_txgbe_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
>  		struct rte_pci_device *pci_dev)
>  {
> -	struct rte_eth_dev *pf_ethdev;
> -	struct rte_eth_devargs eth_da;
>  	int retval;
>  
> -	if (pci_dev->device.devargs) {
> -		retval = rte_eth_devargs_parse(pci_dev->device.devargs->args,
> -				&eth_da);
> -		if (retval)
> -			return retval;
> -	} else {
> -		memset(&eth_da, 0, sizeof(eth_da));
> -	}
> -
>  	retval = rte_eth_dev_create(&pci_dev->device, pci_dev->device.name,
>  			sizeof(struct txgbe_adapter),
>  			eth_dev_pci_specific_init, pci_dev,
>  			eth_txgbe_dev_init, NULL);
>  
> -	if (retval || eth_da.nb_representor_ports < 1)
> +	if (retval)
>  		return retval;
> -	if (eth_da.type != RTE_ETH_REPRESENTOR_VF)
> -		return -ENOTSUP;
> -
> -	pf_ethdev = rte_eth_dev_allocated(pci_dev->device.name);
> -	if (pf_ethdev == NULL)
> -		return -ENODEV;
>  

After patch it becomes:

if (retval)
	return retval;
return 0;

Why not just "return retval"? Or even can eliminate the 'retval' variable.


>  	return 0;
>  }
> @@ -966,7 +949,7 @@ static int eth_txgbe_pci_remove(struct rte_pci_device *pci_dev)
>  
>  	ethdev = rte_eth_dev_allocated(pci_dev->device.name);
>  	if (!ethdev)
> -		return -ENODEV;
> +		return 0;
>  
>  	return rte_eth_dev_destroy(ethdev, eth_txgbe_dev_uninit);
>  }
>
  

Patch

diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 87c041c2ec..afb25fb8a0 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -930,32 +930,15 @@  static int
 eth_txgbe_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 		struct rte_pci_device *pci_dev)
 {
-	struct rte_eth_dev *pf_ethdev;
-	struct rte_eth_devargs eth_da;
 	int retval;
 
-	if (pci_dev->device.devargs) {
-		retval = rte_eth_devargs_parse(pci_dev->device.devargs->args,
-				&eth_da);
-		if (retval)
-			return retval;
-	} else {
-		memset(&eth_da, 0, sizeof(eth_da));
-	}
-
 	retval = rte_eth_dev_create(&pci_dev->device, pci_dev->device.name,
 			sizeof(struct txgbe_adapter),
 			eth_dev_pci_specific_init, pci_dev,
 			eth_txgbe_dev_init, NULL);
 
-	if (retval || eth_da.nb_representor_ports < 1)
+	if (retval)
 		return retval;
-	if (eth_da.type != RTE_ETH_REPRESENTOR_VF)
-		return -ENOTSUP;
-
-	pf_ethdev = rte_eth_dev_allocated(pci_dev->device.name);
-	if (pf_ethdev == NULL)
-		return -ENODEV;
 
 	return 0;
 }
@@ -966,7 +949,7 @@  static int eth_txgbe_pci_remove(struct rte_pci_device *pci_dev)
 
 	ethdev = rte_eth_dev_allocated(pci_dev->device.name);
 	if (!ethdev)
-		return -ENODEV;
+		return 0;
 
 	return rte_eth_dev_destroy(ethdev, eth_txgbe_dev_uninit);
 }