[PATCH -next] cxgb4: Simplify the return expression

Subsystems: cxgb4 ethernet driver (cxgb4), networking drivers, the rest

STALE3675d

2 messages, 2 authors, 2016-08-21 · open the first message on its own page

[PATCH -next] cxgb4: Simplify the return expression

From: Wei Yongjun <hidden>
Date: 2016-08-20 15:32:46

Simplify the return expression.

Signed-off-by: Wei Yongjun <redacted>
---
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 2bb804c..5a82eea 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2922,7 +2922,6 @@ EXPORT_SYMBOL(cxgb4_create_server_filter);
 int cxgb4_remove_server_filter(const struct net_device *dev, unsigned int stid,
 		unsigned int queue, bool ipv6)
 {
-	int ret;
 	struct filter_entry *f;
 	struct adapter *adap;
 
@@ -2936,11 +2935,7 @@ int cxgb4_remove_server_filter(const struct net_device *dev, unsigned int stid,
 	/* Unlock the filter */
 	f->locked = 0;
 
-	ret = delete_filter(adap, stid);
-	if (ret)
-		return ret;
-
-	return 0;
+	return delete_filter(adap, stid);
 }
 EXPORT_SYMBOL(cxgb4_remove_server_filter);
 

Re: [PATCH -next] cxgb4: Simplify the return expression

From: David Miller <davem@davemloft.net>
Date: 2016-08-21 22:23:52

From: Wei Yongjun <redacted>
Date: Sat, 20 Aug 2016 15:32:41 +0000
Simplify the return expression.

Signed-off-by: Wei Yongjun <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help