From patchwork Wed Jun 10 14:21:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Figo.zhang" X-Patchwork-Id: 28411 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id AF12FB70C0 for ; Thu, 11 Jun 2009 00:22:06 +1000 (EST) Received: by ozlabs.org (Postfix) id 9DE4EDDD0C; Thu, 11 Jun 2009 00:22:06 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 31E94DDD0B for ; Thu, 11 Jun 2009 00:22:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756870AbZFJOV5 (ORCPT ); Wed, 10 Jun 2009 10:21:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756800AbZFJOV5 (ORCPT ); Wed, 10 Jun 2009 10:21:57 -0400 Received: from rv-out-0506.google.com ([209.85.198.236]:30879 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756652AbZFJOV4 (ORCPT ); Wed, 10 Jun 2009 10:21:56 -0400 Received: by rv-out-0506.google.com with SMTP id f9so268143rvb.1 for ; Wed, 10 Jun 2009 07:21:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=2hOu3bCQGULTDr1tj6REjEyzLjWHt9KhbHfaHMLvqOY=; b=UcwG8uuGmXEpU5WrkAhfwLYjJfccfj5Bj5SBOiRPDsaeu5cyB31dWbeBDMK0VJBtBk CNxkgglKopHbg27DW3kTAT0MgR4pzNFNZDzmnCMFxFVue8FjEIDvm7yGvIyjRGOXRz2Y 8yIius8ZKnyaU5lN6m+fdZBh3pszhW1EMjTZM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=cWD0cQWAEDSp1tC94KM5URzuFI//goQvueX0YbcRgemRpGd6hVnR0Vmxffi0ps8Y0Z VhDTvz7q/QwLptbr3YdJWESTqFNgPs7k+/+w2NZHWVxXmxaR7ANqva3u2apvgiSXSzG/ PlLORZ+LtCyeDdc7o2+cgWoieiKtcS3qZ1IaU= Received: by 10.140.247.13 with SMTP id u13mr1272913rvh.288.1244643718710; Wed, 10 Jun 2009 07:21:58 -0700 (PDT) Received: from ?221.137.242.99? ([221.137.242.99]) by mx.google.com with ESMTPS id g14sm20380361rvb.42.2009.06.10.07.21.56 (version=SSLv3 cipher=RC4-MD5); Wed, 10 Jun 2009 07:21:58 -0700 (PDT) Subject: [PATCH]vxge-config.c: no need for check From: "Figo.zhang" To: "David S. Miller" Cc: netdev@vger.kernel.org Date: Wed, 10 Jun 2009 22:21:55 +0800 Message-Id: <1244643715.3422.8.camel@myhost> Mime-Version: 1.0 X-Mailer: Evolution 2.26.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org vfree() does its own 'NULL' check, so no need for check before calling it. Signed-off-by: Figo.zhang --- drivers/net/vxge/vxge-config.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) --- 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/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c index 6b41c88..26cde57 100644 --- a/drivers/net/vxge/vxge-config.c +++ b/drivers/net/vxge/vxge-config.c @@ -1884,17 +1884,13 @@ void __vxge_hw_mempool_destroy(struct vxge_hw_mempool *mempool) mempool->memblock_size, dma_object); } - if (mempool->items_arr) - vfree(mempool->items_arr); + vfree(mempool->items_arr); - if (mempool->memblocks_dma_arr) - vfree(mempool->memblocks_dma_arr); + vfree(mempool->memblocks_dma_arr); - if (mempool->memblocks_priv_arr) - vfree(mempool->memblocks_priv_arr); + vfree(mempool->memblocks_priv_arr); - if (mempool->memblocks_arr) - vfree(mempool->memblocks_arr); + vfree(mempool->memblocks_arr); vfree(mempool); }