From patchwork Mon Apr 9 20:50:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 151475 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 8361CB7006 for ; Tue, 10 Apr 2012 06:57:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757501Ab2DIUuj (ORCPT ); Mon, 9 Apr 2012 16:50:39 -0400 Received: from swampdragon.chaosbits.net ([90.184.90.115]:20914 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753224Ab2DIUuh (ORCPT ); Mon, 9 Apr 2012 16:50:37 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 93AD89403D; Mon, 9 Apr 2012 22:50:36 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 919249403B; Mon, 9 Apr 2012 22:50:36 +0200 (CEST) Date: Mon, 9 Apr 2012 22:50:36 +0200 (CEST) From: Jesper Juhl To: linux-kernel@vger.kernel.org cc: trivial@kernel.org, netdev@vger.kernel.org, linux-driver@qlogic.com, Sony Chacko , Anirban Chakraborty Subject: [PATCH 08/26] qlogic, qlcnic: get rid of redundant test for NULL before a call 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 Since release_firmware() deals gracefully with being passed a NULL pointer there's no reason to test explicitly before calling the function. Signed-off-by: Jesper Juhl --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index d32cf0d..799fd40 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c @@ -1321,8 +1321,7 @@ next: void qlcnic_release_firmware(struct qlcnic_adapter *adapter) { - if (adapter->fw) - release_firmware(adapter->fw); + release_firmware(adapter->fw); adapter->fw = NULL; }