diff options
| author | Jody McIntyre <scjody@steamballoon.com> | 2005-05-16 21:54:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 07:59:23 -0700 |
| commit | 616b859fbd0e59707a24612d5b5fec791156c822 (patch) | |
| tree | 2c58dbdfc262006886ac25a8d56c973b4f6a6772 /drivers/ieee1394 | |
| parent | 9ac485dc37b6336c5bf694f9933f43684fd1fd1e (diff) | |
| download | blackbird-op-linux-616b859fbd0e59707a24612d5b5fec791156c822.tar.gz blackbird-op-linux-616b859fbd0e59707a24612d5b5fec791156c822.zip | |
[PATCH] ieee1394: remove NULL checks for kfree
This patch removes redundant NULL pointer checks before kfree() in all of
drivers/ieee1394/
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/nodemgr.c | 3 | ||||
| -rw-r--r-- | drivers/ieee1394/ohci1394.c | 2 | ||||
| -rw-r--r-- | drivers/ieee1394/video1394.c | 29 |
3 files changed, 10 insertions, 24 deletions
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index a1e30a66297b..83e66ed97ab5 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c @@ -1005,8 +1005,7 @@ static struct unit_directory *nodemgr_process_unit_directory return ud; unit_directory_error: - if (ud != NULL) - kfree(ud); + kfree(ud); return NULL; } diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 6cb0b586c297..36e25ac823dc 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c @@ -2931,7 +2931,7 @@ static void free_dma_rcv_ctx(struct dma_rcv_ctx *d) 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 --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index 4bedf7113f40..6eb9b80b1bce 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c @@ -180,23 +180,13 @@ static int free_dma_iso_ctx(struct dma_iso_ctx *d) 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 *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 *file, } } - if (psizes) - kfree(psizes); - + kfree(psizes); return 0; } |
