tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] kfree cleanups in ixj.c

This patch removes redundant checks for NULL pointer before kfree() in
drivers/telephony/

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Jesper Juhl and committed by
Linus Torvalds 0159f76d 89e0b113

+19 -33
unified split
+19 -33
drivers/telephony/ixj.c
··· 329 330 static void ixj_fsk_free(IXJ *j) 331 { 332 - if(j->fskdata != NULL) { 333 - kfree(j->fskdata); 334 - j->fskdata = NULL; 335 - } 336 } 337 338 static void ixj_fsk_alloc(IXJ *j) ··· 3865 j->rec_mode = 7; 3866 break; 3867 default: 3868 j->rec_frame_size = 0; 3869 j->rec_mode = -1; 3870 - if (j->read_buffer) { 3871 - kfree(j->read_buffer); 3872 - j->read_buffer = NULL; 3873 - j->read_buffer_size = 0; 3874 - } 3875 retval = 1; 3876 break; 3877 } ··· 3987 3988 static void ixj_record_stop(IXJ *j) 3989 { 3990 - if(ixjdebug & 0x0002) 3991 printk("IXJ %d Stopping Record Codec %d at %ld\n", j->board, j->rec_codec, jiffies); 3992 3993 - if (j->read_buffer) { 3994 - kfree(j->read_buffer); 3995 - j->read_buffer = NULL; 3996 - j->read_buffer_size = 0; 3997 - } 3998 if (j->rec_mode > -1) { 3999 ixj_WriteDSPCommand(0x5120, j); 4000 j->rec_mode = -1; ··· 4443 j->play_mode = 5; 4444 break; 4445 default: 4446 j->play_frame_size = 0; 4447 j->play_mode = -1; 4448 - if (j->write_buffer) { 4449 - kfree(j->write_buffer); 4450 - j->write_buffer = NULL; 4451 - j->write_buffer_size = 0; 4452 - } 4453 retval = 1; 4454 break; 4455 } ··· 4570 4571 static void ixj_play_stop(IXJ *j) 4572 { 4573 - if(ixjdebug & 0x0002) 4574 printk("IXJ %d Stopping Play Codec %d at %ld\n", j->board, j->play_codec, jiffies); 4575 4576 - if (j->write_buffer) { 4577 - kfree(j->write_buffer); 4578 - j->write_buffer = NULL; 4579 - j->write_buffer_size = 0; 4580 - } 4581 if (j->play_mode > -1) { 4582 ixj_WriteDSPCommand(0x5221, j); /* Stop playback and flush buffers. 8022 reference page 9-40 */ 4583 ··· 5800 ixj_play_tone(j, 0); 5801 j->tone_state = j->tone_cadence_state = 0; 5802 if (j->cadence_t) { 5803 - if (j->cadence_t->ce) { 5804 - kfree(j->cadence_t->ce); 5805 - } 5806 kfree(j->cadence_t); 5807 j->cadence_t = NULL; 5808 } ··· 7485 printk(KERN_INFO "IXJ: Releasing XILINX address for /dev/phone%d\n", cnt); 7486 release_region(j->XILINXbase, 4); 7487 } 7488 - if (j->read_buffer) 7489 - kfree(j->read_buffer); 7490 - if (j->write_buffer) 7491 - kfree(j->write_buffer); 7492 if (j->dev) 7493 pnp_device_detach(j->dev); 7494 if (ixjdebug & 0x0002)
··· 329 330 static void ixj_fsk_free(IXJ *j) 331 { 332 + kfree(j->fskdata); 333 + j->fskdata = NULL; 334 } 335 336 static void ixj_fsk_alloc(IXJ *j) ··· 3867 j->rec_mode = 7; 3868 break; 3869 default: 3870 + kfree(j->read_buffer); 3871 j->rec_frame_size = 0; 3872 j->rec_mode = -1; 3873 + j->read_buffer = NULL; 3874 + j->read_buffer_size = 0; 3875 retval = 1; 3876 break; 3877 } ··· 3991 3992 static void ixj_record_stop(IXJ *j) 3993 { 3994 + if (ixjdebug & 0x0002) 3995 printk("IXJ %d Stopping Record Codec %d at %ld\n", j->board, j->rec_codec, jiffies); 3996 3997 + kfree(j->read_buffer); 3998 + j->read_buffer = NULL; 3999 + j->read_buffer_size = 0; 4000 if (j->rec_mode > -1) { 4001 ixj_WriteDSPCommand(0x5120, j); 4002 j->rec_mode = -1; ··· 4449 j->play_mode = 5; 4450 break; 4451 default: 4452 + kfree(j->write_buffer); 4453 j->play_frame_size = 0; 4454 j->play_mode = -1; 4455 + j->write_buffer = NULL; 4456 + j->write_buffer_size = 0; 4457 retval = 1; 4458 break; 4459 } ··· 4578 4579 static void ixj_play_stop(IXJ *j) 4580 { 4581 + if (ixjdebug & 0x0002) 4582 printk("IXJ %d Stopping Play Codec %d at %ld\n", j->board, j->play_codec, jiffies); 4583 4584 + kfree(j->write_buffer); 4585 + j->write_buffer = NULL; 4586 + j->write_buffer_size = 0; 4587 if (j->play_mode > -1) { 4588 ixj_WriteDSPCommand(0x5221, j); /* Stop playback and flush buffers. 8022 reference page 9-40 */ 4589 ··· 5810 ixj_play_tone(j, 0); 5811 j->tone_state = j->tone_cadence_state = 0; 5812 if (j->cadence_t) { 5813 + kfree(j->cadence_t->ce); 5814 kfree(j->cadence_t); 5815 j->cadence_t = NULL; 5816 } ··· 7497 printk(KERN_INFO "IXJ: Releasing XILINX address for /dev/phone%d\n", cnt); 7498 release_region(j->XILINXbase, 4); 7499 } 7500 + kfree(j->read_buffer); 7501 + kfree(j->write_buffer); 7502 if (j->dev) 7503 pnp_device_detach(j->dev); 7504 if (ixjdebug & 0x0002)