From: Colin Ian King <[email protected]>
The non-zero check on rc is redundant as a previous non-zero
check on rc will always return and the second check is never
reached, hence it is redundant and can be removed. Also
remove a blank line.
Addresses-Coverity: ("Logically dead code")
Signed-off-by: Colin Ian King <[email protected]>
---
drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
index ced1d577b62a..1e38930353f2 100644
--- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
+++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
@@ -674,7 +674,6 @@ static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,
* supports getting/setting the hash function.
*/
rc = ena_com_get_hash_function(adapter->ena_dev, &ena_func, key);
-
if (rc) {
if (rc == -EOPNOTSUPP) {
key = NULL;
@@ -685,9 +684,6 @@ static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,
return rc;
}
- if (rc)
- return rc;
-
switch (ena_func) {
case ENA_ADMIN_TOEPLITZ:
func = ETH_RSS_HASH_TOP;
--
2.25.0
Ack, Thanks
> -----Original Message-----
> From: Colin King <[email protected]>
> Sent: Saturday, February 22, 2020 1:27 AM
> To: Belgazal, Netanel <[email protected]>; Kiyanovski, Arthur
> <[email protected]>; Tzalik, Guy <[email protected]>; Bshara, Saeed
> <[email protected]>; Machulsky, Zorik <[email protected]>; David S .
> Miller <[email protected]>; Jubran, Samih <[email protected]>;
> [email protected]
> Cc: [email protected]; [email protected]
> Subject: [PATCH] net: ena: ethtool: remove redundant non-zero check on rc
>
> From: Colin Ian King <[email protected]>
>
> The non-zero check on rc is redundant as a previous non-zero check on rc will
> always return and the second check is never reached, hence it is redundant
> and can be removed. Also remove a blank line.
>
> Addresses-Coverity: ("Logically dead code")
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> index ced1d577b62a..1e38930353f2 100644
> --- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> +++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
> @@ -674,7 +674,6 @@ static int ena_get_rxfh(struct net_device *netdev,
> u32 *indir, u8 *key,
> * supports getting/setting the hash function.
> */
> rc = ena_com_get_hash_function(adapter->ena_dev, &ena_func,
> key);
> -
> if (rc) {
> if (rc == -EOPNOTSUPP) {
> key = NULL;
> @@ -685,9 +684,6 @@ static int ena_get_rxfh(struct net_device *netdev,
> u32 *indir, u8 *key,
> return rc;
> }
>
> - if (rc)
> - return rc;
> -
> switch (ena_func) {
> case ENA_ADMIN_TOEPLITZ:
> func = ETH_RSS_HASH_TOP;
> --
> 2.25.0
From: Colin King <[email protected]>
Date: Fri, 21 Feb 2020 23:26:53 +0000
> From: Colin Ian King <[email protected]>
>
> The non-zero check on rc is redundant as a previous non-zero
> check on rc will always return and the second check is never
> reached, hence it is redundant and can be removed. Also
> remove a blank line.
>
> Addresses-Coverity: ("Logically dead code")
> Signed-off-by: Colin Ian King <[email protected]>
Applied to net-next.