From patchwork Mon Apr 9 20:50:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 151478 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 CBC63B7021 for ; Tue, 10 Apr 2012 06:57:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757287Ab2DIUuY (ORCPT ); Mon, 9 Apr 2012 16:50:24 -0400 Received: from swampdragon.chaosbits.net ([90.184.90.115]:20863 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753224Ab2DIUuW (ORCPT ); Mon, 9 Apr 2012 16:50:22 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id DFD469403D; Mon, 9 Apr 2012 22:50:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id DDB479403B; Mon, 9 Apr 2012 22:50:15 +0200 (CEST) Date: Mon, 9 Apr 2012 22:50:15 +0200 (CEST) From: Jesper Juhl To: linux-kernel@vger.kernel.org cc: trivial@kernel.org, netdev@vger.kernel.org, Michael Chan , Matt Carlson Subject: [PATCH 05/26] tg3: remove redundant NULL test before release_firmware() call 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 is no need to test for a NULL pointer before calling release_firmware - the function does that on its own. Signed-off-by: Jesper Juhl --- drivers/net/ethernet/broadcom/tg3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 062ac33..9fbf73e 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -15842,8 +15842,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev) if (dev) { struct tg3 *tp = netdev_priv(dev); - if (tp->fw) - release_firmware(tp->fw); + release_firmware(tp->fw); tg3_reset_task_cancel(tp);