From patchwork Mon Apr 9 20:51:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 151469 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 CDE99B6FDF for ; Tue, 10 Apr 2012 06:55:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758070Ab2DIUvW (ORCPT ); Mon, 9 Apr 2012 16:51:22 -0400 Received: from swampdragon.chaosbits.net ([90.184.90.115]:21076 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756930Ab2DIUvU (ORCPT ); Mon, 9 Apr 2012 16:51:20 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 22D389403F; Mon, 9 Apr 2012 22:51:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 209A19403B; Mon, 9 Apr 2012 22:51:19 +0200 (CEST) Date: Mon, 9 Apr 2012 22:51:19 +0200 (CEST) From: Jesper Juhl To: linux-kernel@vger.kernel.org cc: trivial@kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, Pavel Roskin , Paul Gortmaker , "John W. Linville" Subject: [PATCH 15/26] wireless, orinoco: release_firmware() tests for NULL, remove explicit tests before calls 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 It is redundant to test for NULL pointers before calling release_firmware() since the function does its own NULL test. Signed-off-by: Jesper Juhl --- drivers/net/wireless/orinoco/fw.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c index 4df8cf6..400a352 100644 --- a/drivers/net/wireless/orinoco/fw.c +++ b/drivers/net/wireless/orinoco/fw.c @@ -379,11 +379,8 @@ void orinoco_cache_fw(struct orinoco_private *priv, int ap) void orinoco_uncache_fw(struct orinoco_private *priv) { - if (priv->cached_pri_fw) - release_firmware(priv->cached_pri_fw); - if (priv->cached_fw) - release_firmware(priv->cached_fw); - + release_firmware(priv->cached_pri_fw); + release_firmware(priv->cached_fw); priv->cached_pri_fw = NULL; priv->cached_fw = NULL; }