From patchwork Sat Jan 1 04:59:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 77127 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 1B40CB70A4 for ; Sat, 1 Jan 2011 16:00:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751227Ab1AAFAP (ORCPT ); Sat, 1 Jan 2011 00:00:15 -0500 Received: from mail.windriver.com ([147.11.1.11]:53335 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994Ab1AAFAM (ORCPT ); Sat, 1 Jan 2011 00:00:12 -0500 Received: from ALA-MAIL03.corp.ad.wrs.com (ala-mail03 [147.11.57.144]) by mail.windriver.com (8.14.3/8.14.3) with ESMTP id p0150B6j010669; Fri, 31 Dec 2010 21:00:11 -0800 (PST) Received: from ala-mail06.corp.ad.wrs.com ([147.11.57.147]) by ALA-MAIL03.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 31 Dec 2010 21:00:11 -0800 Received: from yow-pgortmak-d1.corp.ad.wrs.com ([128.224.146.65]) by ala-mail06.corp.ad.wrs.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 31 Dec 2010 21:00:11 -0800 From: Paul Gortmaker To: davem@davemloft.net Cc: netdev@vger.kernel.org, allan.stephens@windriver.com, Allan Stephens , Paul Gortmaker Subject: [PATCH net-next 15/20] tipc: remove pointless check for NULL prior to kfree Date: Fri, 31 Dec 2010 23:59:30 -0500 Message-Id: <1293857975-30267-16-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 1.7.3.3 In-Reply-To: <1293857975-30267-1-git-send-email-paul.gortmaker@windriver.com> References: <1293857975-30267-1-git-send-email-paul.gortmaker@windriver.com> X-OriginalArrivalTime: 01 Jan 2011 05:00:11.0577 (UTC) FILETIME=[C4F14A90:01CBA970] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Allan Stephens It is acceptable to call kfree() with NULL, so these checks are not serving any useful purpose. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker --- net/tipc/name_distr.c | 4 +--- net/tipc/port.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index 376a30b..a6c989f 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c @@ -240,9 +240,7 @@ static void node_is_down(struct publication *publ) publ->type, publ->lower, publ->node, publ->ref, publ->key); } - if (p) { - kfree(p); - } + kfree(p); } /** diff --git a/net/tipc/port.c b/net/tipc/port.c index 8bacd57..db14b7e 100644 --- a/net/tipc/port.c +++ b/net/tipc/port.c @@ -269,9 +269,7 @@ int tipc_deleteport(u32 ref) buf = port_build_peer_abort_msg(p_ptr, TIPC_ERR_NO_PORT); tipc_nodesub_unsubscribe(&p_ptr->subscription); } - if (p_ptr->user_port) { - kfree(p_ptr->user_port); - } + kfree(p_ptr->user_port); spin_lock_bh(&tipc_port_list_lock); list_del(&p_ptr->port_list);