summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHal Rosenstock <halr@voltaire.com>2005-08-13 20:50:27 -0700
committerRoland Dreier <rolandd@cisco.com>2005-08-26 20:37:35 -0700
commit92a6b34bf4d0d11c54b2a6bdd6240f98cb326200 (patch)
tree847c73d3cf07ec28357579417070f8952952e253
parent2a1d9b7f09aaaacf235656cb32a40ba2c79590b3 (diff)
downloadop-kernel-dev-92a6b34bf4d0d11c54b2a6bdd6240f98cb326200.zip
op-kernel-dev-92a6b34bf4d0d11c54b2a6bdd6240f98cb326200.tar.gz
[PATCH] IB: Eliminate redundant NULL checks
IPoIB: Eliminate NULL checks prior to calling kfree Signed-off-by: Hal Rosenstock <halr@voltaire.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_main.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index b07383e..d4300e4 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -782,15 +782,11 @@ void ipoib_dev_cleanup(struct net_device *dev)
ipoib_ib_dev_cleanup(dev);
- if (priv->rx_ring) {
- kfree(priv->rx_ring);
- priv->rx_ring = NULL;
- }
+ kfree(priv->rx_ring);
+ kfree(priv->tx_ring);
- if (priv->tx_ring) {
- kfree(priv->tx_ring);
- priv->tx_ring = NULL;
- }
+ priv->rx_ring = NULL;
+ priv->tx_ring = NULL;
}
static void ipoib_setup(struct net_device *dev)
OpenPOWER on IntegriCloud