Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262690AbVDPPwn (ORCPT ); Sat, 16 Apr 2005 11:52:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262691AbVDPPwm (ORCPT ); Sat, 16 Apr 2005 11:52:42 -0400 Received: from mail.dif.dk ([193.138.115.101]:22463 "EHLO saerimmer.dif.dk") by vger.kernel.org with ESMTP id S262690AbVDPPw0 (ORCPT ); Sat, 16 Apr 2005 11:52:26 -0400 Date: Sat, 16 Apr 2005 17:55:19 +0200 (CEST) From: Jesper Juhl To: Ben Collins Cc: Jody McIntyre , linux1394-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH] ieee1394: remove NULL checks prior to kfree in ieee1394, kfree handles null pointers fine. Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2948 Lines: 104 This patch removes redundant NULL pointer checks before kfree() in all of drivers/ieee1394/ Signed-off-by: Jesper Juhl --- drivers/ieee1394/nodemgr.c | 3 +-- drivers/ieee1394/ohci1394.c | 2 +- drivers/ieee1394/video1394.c | 29 ++++++++--------------------- 3 files changed, 10 insertions(+), 24 deletions(-) diff -upr linux-2.6.12-rc2-mm3-orig/drivers/ieee1394/nodemgr.c linux-2.6.12-rc2-mm3/drivers/ieee1394/nodemgr.c --- linux-2.6.12-rc2-mm3-orig/drivers/ieee1394/nodemgr.c 2005-04-11 21:20:41.000000000 +0200 +++ linux-2.6.12-rc2-mm3/drivers/ieee1394/nodemgr.c 2005-04-16 17:44:23.000000000 +0200 @@ -1006,8 +1006,7 @@ static struct unit_directory *nodemgr_pr return ud; unit_directory_error: - if (ud != NULL) - kfree(ud); + kfree(ud); return NULL; } diff -upr linux-2.6.12-rc2-mm3-orig/drivers/ieee1394/ohci1394.c linux-2.6.12-rc2-mm3/drivers/ieee1394/ohci1394.c --- linux-2.6.12-rc2-mm3-orig/drivers/ieee1394/ohci1394.c 2005-04-05 21:21:24.000000000 +0200 +++ linux-2.6.12-rc2-mm3/drivers/ieee1394/ohci1394.c 2005-04-16 17:44:48.000000000 +0200 @@ -2893,7 +2893,7 @@ static void free_dma_rcv_ctx(struct dma_ kfree(d->prg_cpu); kfree(d->prg_bus); } - if (d->spb) kfree(d->spb); + kfree(d->spb); /* Mark this context as freed. */ d->ohci = NULL; diff -upr linux-2.6.12-rc2-mm3-orig/drivers/ieee1394/video1394.c linux-2.6.12-rc2-mm3/drivers/ieee1394/video1394.c --- linux-2.6.12-rc2-mm3-orig/drivers/ieee1394/video1394.c 2005-04-11 21:20:41.000000000 +0200 +++ linux-2.6.12-rc2-mm3/drivers/ieee1394/video1394.c 2005-04-16 17:47:03.000000000 +0200 @@ -180,23 +180,13 @@ static int free_dma_iso_ctx(struct dma_i kfree(d->prg_reg); } - if (d->ir_prg) - kfree(d->ir_prg); - - if (d->it_prg) - kfree(d->it_prg); - - if (d->buffer_status) - kfree(d->buffer_status); - if (d->buffer_time) - kfree(d->buffer_time); - if (d->last_used_cmd) - kfree(d->last_used_cmd); - if (d->next_buffer) - kfree(d->next_buffer); - + kfree(d->ir_prg); + kfree(d->it_prg); + kfree(d->buffer_status); + kfree(d->buffer_time); + kfree(d->last_used_cmd); + kfree(d->next_buffer); list_del(&d->link); - kfree(d); return 0; @@ -1060,8 +1050,7 @@ static int __video1394_ioctl(struct file PRINT(KERN_ERR, ohci->host->id, "Buffer %d is already used",v.buffer); spin_unlock_irqrestore(&d->lock,flags); - if (psizes) - kfree(psizes); + kfree(psizes); return -EBUSY; } @@ -1116,9 +1105,7 @@ static int __video1394_ioctl(struct file } } - if (psizes) - kfree(psizes); - + kfree(psizes); return 0; } -- Jesper Juhl PS. Please CC: me on replies as I'm not subscribed to the linux1394-devel list. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/