From patchwork Thu Aug 19 10:04:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 62127 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D076CB70DC for ; Thu, 19 Aug 2010 20:05:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752358Ab0HSKFH (ORCPT ); Thu, 19 Aug 2010 06:05:07 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:64295 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751949Ab0HSKE4 (ORCPT ); Thu, 19 Aug 2010 06:04:56 -0400 Received: by wwi17 with SMTP id 17so2232363wwi.1 for ; Thu, 19 Aug 2010 03:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=4H2sR77/+BQsQtHfHTreqcxwRFZYddz5yN1NSm+8GjE=; b=RPYgca8tYuWy6V/s820BSFyxHcNGXqNHE8vNcZ2ac2KXpuPze6ZvpoUZYM0VtwTMB2 /wSZPWsvUV85vvkNBZB/nMw2YNqLS3Rz0HoTxRTlCkla1aNt4kcnSM3XwEw/TK2Sxke/ TVNw1dgF/D8JIhyxufcv7kKOSJLLf7ecCABjw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=Ug+C4Jdn6vY01yjV7Kkb+IrEET3Ny/nSAgY0VJavncV4nCX4oYP0FTsm7LWRKyRpAf 8m/rB14BL7RMRx7SlG95dw+Y0GQuHvs2j0mGGdybBpGetiJABmnlGDlqT6Ji4N4HGJpt JmML8AaO4tAWWXqqefRkCK6WgJqgIs1agFn7g= Received: by 10.227.68.207 with SMTP id w15mr8262909wbi.75.1282212294333; Thu, 19 Aug 2010 03:04:54 -0700 (PDT) Received: from bicker ([41.205.146.22]) by mx.google.com with ESMTPS id l55sm875024weq.17.2010.08.19.03.04.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 19 Aug 2010 03:04:54 -0700 (PDT) Date: Thu, 19 Aug 2010 12:04:38 +0200 From: Dan Carpenter To: netdev@vger.kernel.org Cc: "David S. Miller" , kernel-janitors@vger.kernel.org Subject: [patch] tokenring: remove unneeded NULL checks Message-ID: <20100819100438.GC6674@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org "fw_entry" is always non-NULL at this point and anyway release_firmware() handles NULL parameters. Signed-off-by: Dan Carpenter --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index 435ef7d..08182fd 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); }