From patchwork Mon Apr 9 20:50:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 151479 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 7D365B7021 for ; Tue, 10 Apr 2012 06:57:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757177Ab2DIUuN (ORCPT ); Mon, 9 Apr 2012 16:50:13 -0400 Received: from swampdragon.chaosbits.net ([90.184.90.115]:20840 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750734Ab2DIUuL (ORCPT ); Mon, 9 Apr 2012 16:50:11 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 6F3A094040; Mon, 9 Apr 2012 22:50:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 6D5159403F; Mon, 9 Apr 2012 22:50:10 +0200 (CEST) Date: Mon, 9 Apr 2012 22:50:10 +0200 (CEST) From: Jesper Juhl To: linux-kernel@vger.kernel.org cc: trivial@kernel.org, netdev@vger.kernel.org, David Dillow Subject: [PATCH 04/26] typhoon: get rid of redundant conditional before all to release_firmware() In-Reply-To: Message-ID: References: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There's no need to test for a NULL pointer before calling release_firmware() since the function does that check itself, so remove the redundant test. Signed-off-by: Jesper Juhl Acked-by: David Dillow --- drivers/net/ethernet/3com/typhoon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index 1234a14..b153666 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c @@ -2549,8 +2549,7 @@ typhoon_init(void) static void __exit typhoon_cleanup(void) { - if (typhoon_fw) - release_firmware(typhoon_fw); + release_firmware(typhoon_fw); pci_unregister_driver(&typhoon_driver); }