From: Dan Carpenter <error27@gmail.com>
Date: Sun, 22 Aug 2010 07:54:30 +0000 (-0700)
Subject: tokenring: remove unneeded NULL checks
X-Git-Tag: v2.6.37-rc1~147^2~728
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=773bc97397ea2cfc2ff3c075f712aaf376ed7cb0;p=~shefty%2Frdma-dev.git

tokenring: remove unneeded NULL checks

"fw_entry" is always non-NULL at this point and anyway
release_firmware() handles NULL parameters.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index 435ef7d5470..08182fde3dc 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -1321,14 +1321,12 @@ static int tms380tr_reset_adapter(struct net_device *dev)
 
 			/* Clear CPHALT and start BUD */
 			SIFWRITEW(c, SIFACL);
-			if (fw_entry)
-				release_firmware(fw_entry);
+			release_firmware(fw_entry);
 			return (1);
 		}
 	} while(count == 0);
 
-	if (fw_entry)
-		release_firmware(fw_entry);
+	release_firmware(fw_entry);
 	printk(KERN_INFO "%s: Adapter Download Failed\n", dev->name);
 	return (-1);
 }