From 80a086833a4629ee6e5365f7066c8e9adb833726 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 23 Feb 2008 23:42:11 +0100 Subject: [PATCH] remove useless if-before-kfree tests also a few if-before-free tests Signed-off-by: Jim Meyering --- arch/arm/mach-omap2/pm-debug.c | 3 +- arch/powerpc/platforms/powermac/low_i2c.c | 3 +- arch/um/kernel/skas/mmu.c | 3 +- drivers/acpi/processor_core.c | 3 +- drivers/ata/sata_fsl.c | 3 +- drivers/block/z2ram.c | 5 +--- drivers/char/hvc_iucv.c | 3 +- drivers/char/n_hdlc.c | 20 +++++++----------- drivers/char/pcmcia/ipwireless/hardware.c | 3 +- drivers/crypto/talitos.c | 3 +- drivers/gpu/drm/i915/intel_dvo.c | 3 +- drivers/gpu/drm/radeon/atom.c | 3 +- drivers/gpu/drm/radeon/radeon_display.c | 4 +-- drivers/infiniband/hw/nes/nes_verbs.c | 3 +- drivers/macintosh/windfarm_pm81.c | 6 +--- drivers/macintosh/windfarm_pm91.c | 3 +- drivers/media/dvb/dvb-usb/cinergyT2-fe.c | 3 +- drivers/media/dvb/siano/smscoreapi.c | 3 +- drivers/media/video/ivtv/ivtvfb.c | 3 +- drivers/message/fusion/mptfc.c | 3 +- drivers/message/fusion/mptspi.c | 3 +- drivers/mmc/card/queue.c | 15 ++++--------- drivers/mmc/core/bus.c | 3 +- drivers/mmc/core/sdio_bus.c | 3 +- drivers/mtd/chips/cfi_cmdset_0001.c | 3 +- drivers/mtd/maps/ck804xrom.c | 3 +- drivers/net/forcedeth.c | 12 +++------- drivers/net/irda/kingsun-sir.c | 4 +- drivers/net/myri10ge/myri10ge.c | 3 +- drivers/net/netxen/netxen_nic_main.c | 3 +- drivers/net/ppp_mppe.c | 6 +--- drivers/net/qla3xxx.c | 2 +- drivers/net/stmmac/stmmac_main.c | 3 +- drivers/net/usb/hso.c | 3 +- drivers/net/wireless/ath/ath5k/attach.c | 3 +- drivers/net/wireless/ipw2x00/libipw_module.c | 3 +- drivers/rtc/rtc-m48t59.c | 3 +- drivers/s390/char/monreader.c | 3 +- drivers/scsi/aic7xxx/aicasm/aicasm_scan.l | 3 +- drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | 12 +++------- drivers/scsi/aic94xx/aic94xx_init.c | 3 +- drivers/staging/altpciechdma/altpciechdma.c | 3 +- drivers/staging/comedi/drivers/amplc_dio200.c | 8 +----- drivers/staging/comedi/drivers/amplc_pci224.c | 16 +++----------- drivers/staging/comedi/drivers/cb_das16_cs.c | 3 +- drivers/staging/comedi/drivers/das08_cs.c | 3 +- drivers/staging/comedi/drivers/das16.c | 6 +--- drivers/staging/comedi/drivers/das1800.c | 6 +--- drivers/staging/comedi/drivers/ni_670x.c | 4 +-- drivers/staging/comedi/drivers/ni_at_a2150.c | 3 +- drivers/staging/comedi/drivers/ni_daq_700.c | 3 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 3 +- drivers/staging/comedi/drivers/ni_labpc.c | 3 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 3 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 3 +- drivers/staging/comedi/drivers/serial2002.c | 19 ++++++----------- drivers/staging/cx25821/cx25821-audio-upstream.c | 3 +- .../staging/cx25821/cx25821-video-upstream-ch2.c | 3 +- drivers/staging/cx25821/cx25821-video-upstream.c | 3 +- drivers/staging/dream/camera/msm_camera.c | 8 ++---- drivers/staging/dream/camera/msm_vfe7x.c | 3 +- drivers/staging/go7007/go7007-usb.c | 6 +--- drivers/staging/pohmelfs/config.c | 6 +--- drivers/staging/rt2860/common/spectrum.c | 6 +--- drivers/staging/rt3090/common/crypt_biginteger.c | 3 +- drivers/staging/rt3090/common/ee_efuse.c | 3 +- drivers/staging/rt3090/common/rtmp_mcu.c | 6 +--- drivers/staging/rt3090/common/spectrum.c | 6 +--- drivers/staging/rt3090/rt_ate.c | 3 +- drivers/staging/rt3090/rt_linux.c | 6 +--- drivers/staging/rt3090/sta_ioctl.c | 9 ++----- .../rtl8187se/ieee80211/ieee80211_softmac.c | 3 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 1 - drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 1 - drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 1 - drivers/staging/serqt_usb2/serqt_usb2.c | 3 +- drivers/staging/usbip/stub_main.c | 6 +--- drivers/staging/vme/bridges/vme_ca91cx42.c | 3 +- drivers/staging/vme/bridges/vme_tsi148.c | 3 +- drivers/staging/vt6655/device_main.c | 3 +- drivers/staging/vt6655/hostap.c | 3 +- drivers/staging/vt6655/wpactl.c | 3 +- drivers/staging/vt6656/firmware.c | 6 +--- drivers/staging/vt6656/hostap.c | 3 +- drivers/staging/vt6656/main_usb.c | 12 +++------- drivers/staging/vt6656/wpactl.c | 3 +- drivers/staging/winbond/wb35reg.c | 3 +- drivers/staging/wlan-ng/prism2fw.c | 4 +-- drivers/usb/serial/mos7840.c | 7 +---- drivers/uwb/wlp/wlp-lc.c | 3 +- drivers/video/au1200fb.c | 6 +--- drivers/video/console/softcursor.c | 3 +- drivers/video/uvesafb.c | 21 ++++++------------- fs/btrfs/free-space-cache.c | 6 +--- fs/dlm/memory.c | 3 +- fs/ecryptfs/keystore.c | 3 +- fs/ecryptfs/messaging.c | 6 +--- fs/jffs2/acl.c | 3 +- fs/jffs2/scan.c | 3 +- fs/jffs2/xattr.c | 3 +- fs/nfs/nfs4proc.c | 3 +- fs/ocfs2/alloc.c | 3 +- fs/ocfs2/cluster/heartbeat.c | 6 +--- fs/ocfs2/cluster/tcp.c | 6 +--- fs/ocfs2/dlm/dlmdomain.c | 3 +- fs/ocfs2/dlm/dlmrecovery.c | 6 +--- fs/ocfs2/extent_map.c | 3 +- fs/ocfs2/journal.c | 9 ++----- fs/ocfs2/localalloc.c | 6 +--- fs/ocfs2/super.c | 6 +--- include/net/netfilter/nf_conntrack_extend.h | 3 +- net/tipc/name_distr.c | 4 +-- scripts/dtc/data.c | 3 +- scripts/genksyms/lex.c_shipped | 3 +- scripts/genksyms/lex.l | 3 +- scripts/kconfig/confdata.c | 3 +- scripts/kconfig/util.c | 3 +- sound/aoa/codecs/onyx.c | 3 +- sound/aoa/core/gpio-pmf.c | 9 ++----- sound/core/control.c | 3 +- sound/pci/ctxfi/ctdaio.c | 6 +--- sound/pci/emu10k1/emufx.c | 3 +- sound/pci/hda/hda_codec.c | 3 +- sound/soc/pxa/pxa-ssp.c | 3 +- tools/perf/builtin-sched.c | 3 +- tools/perf/util/module.c | 18 +++++----------- tools/perf/util/thread.c | 6 +--- tools/perf/util/trace-event-parse.c | 9 ++----- usr/gen_init_cpio.c | 2 +- 129 files changed, 201 insertions(+), 407 deletions(-) diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index 2fc4d6a..d6673cc 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c @@ -287,8 +287,7 @@ static int pm_dbg_show_regs(struct seq_file *s, void *unused) i++; } - if (store != NULL) - kfree(store); + kfree(store); return 0; } diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c index 414ca98..f4a0948 100644 --- a/arch/powerpc/platforms/powermac/low_i2c.c +++ b/arch/powerpc/platforms/powermac/low_i2c.c @@ -1272,8 +1272,7 @@ static void pmac_i2c_do_end(struct pmf_function *func, void *instdata) if (inst == NULL) return; pmac_i2c_close(inst->bus); - if (inst) - kfree(inst); + kfree(inst); } static int pmac_i2c_do_read(PMF_STD_ARGS, u32 len) diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c index 8bfd1e9..76528db 100644 --- a/arch/um/kernel/skas/mmu.c +++ b/arch/um/kernel/skas/mmu.c @@ -150,8 +150,7 @@ void arch_exit_mmap(struct mm_struct *mm) { pte_t *pte; - if (mm->context.stub_pages != NULL) - kfree(mm->context.stub_pages); + kfree(mm->context.stub_pages); pte = virt_to_pte(mm, STUB_CODE); if (pte != NULL) pte_clear(mm, STUB_CODE, pte); diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index c567b46..0a2113b 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -551,8 +551,7 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id) } exit: - if (buffer.pointer) - kfree(buffer.pointer); + kfree(buffer.pointer); return apic_id; } diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index d344db4..634f1d5 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c @@ -1357,8 +1357,7 @@ error_exit_with_cleanup: if (hcr_base) iounmap(hcr_base); - if (host_priv) - kfree(host_priv); + kfree(host_priv); return retval; } diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index 64f941e..92126b1 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c @@ -396,10 +396,7 @@ static void __exit z2_exit(void) } } - if ( z2ram_map != NULL ) - { - kfree( z2ram_map ); - } + kfree( z2ram_map ); } return; diff --git a/drivers/char/hvc_iucv.c b/drivers/char/hvc_iucv.c index b8a5d65..513693d 100644 --- a/drivers/char/hvc_iucv.c +++ b/drivers/char/hvc_iucv.c @@ -1310,8 +1310,7 @@ out_error_memory: mempool_destroy(hvc_iucv_mempool); kmem_cache_destroy(hvc_iucv_buffer_cache); out_error: - if (hvc_iucv_filter) - kfree(hvc_iucv_filter); + kfree(hvc_iucv_filter); hvc_iucv_devices = 0; /* ensure that we do not provide any device */ return rc; } diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c index c68118e..414c691 100644 --- a/drivers/char/n_hdlc.c +++ b/drivers/char/n_hdlc.c @@ -260,31 +260,27 @@ static void n_hdlc_release(struct n_hdlc *n_hdlc) /* Release transmit and receive buffers */ for(;;) { buf = n_hdlc_buf_get(&n_hdlc->rx_free_buf_list); - if (buf) { - kfree(buf); - } else + if (!buf) break; + kfree(buf); } for(;;) { buf = n_hdlc_buf_get(&n_hdlc->tx_free_buf_list); - if (buf) { - kfree(buf); - } else + if (!buf) break; + kfree(buf); } for(;;) { buf = n_hdlc_buf_get(&n_hdlc->rx_buf_list); - if (buf) { - kfree(buf); - } else + if (!buf) break; + kfree(buf); } for(;;) { buf = n_hdlc_buf_get(&n_hdlc->tx_buf_list); - if (buf) { - kfree(buf); - } else + if (!buf) break; + kfree(buf); } kfree(n_hdlc->tbuf); kfree(n_hdlc); diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c index 4c1820c..d232219 100644 --- a/drivers/char/pcmcia/ipwireless/hardware.c +++ b/drivers/char/pcmcia/ipwireless/hardware.c @@ -1732,8 +1732,7 @@ void ipwireless_hardware_free(struct ipw_hardware *hw) flush_scheduled_work(); for (i = 0; i < NL_NUM_OF_ADDRESSES; i++) - if (hw->packet_assembler[i] != NULL) - kfree(hw->packet_assembler[i]); + kfree(hw->packet_assembler[i]); for (i = 0; i < NL_NUM_OF_PRIORITIES; i++) list_for_each_entry_safe(tp, tq, &hw->tx_queue[i], queue) { diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index c47ffe8..aa27d8c 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -1755,8 +1755,7 @@ static int talitos_remove(struct of_device *ofdev) talitos_unregister_rng(dev); for (i = 0; i < priv->num_channels; i++) - if (priv->chan[i].fifo) - kfree(priv->chan[i].fifo); + kfree(priv->chan[i].fifo); kfree(priv->chan); diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index a4d2606..30f1e8d 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c @@ -280,8 +280,7 @@ static void intel_dvo_destroy (struct drm_connector *connector) if (dvo) { if (dvo->dev_ops->destroy) dvo->dev_ops->destroy(dvo); - if (dvo->panel_fixed_mode) - kfree(dvo->panel_fixed_mode); + kfree(dvo->panel_fixed_mode); /* no need, in i830_dvoices[] now */ //kfree(dvo); } diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index 901befe..38b9122 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c @@ -1179,8 +1179,7 @@ int atom_asic_init(struct atom_context *ctx) void atom_destroy(struct atom_context *ctx) { - if (ctx->iio) - kfree(ctx->iio); + kfree(ctx->iio); kfree(ctx); } diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index 3655d91..214d710 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c @@ -376,9 +376,7 @@ static int radeon_ddc_dump(struct drm_connector *connector) radeon_i2c_do_lock(radeon_connector, 1); edid = drm_get_edid(connector, &radeon_connector->ddc_bus->adapter); radeon_i2c_do_lock(radeon_connector, 0); - if (edid) { - kfree(edid); - } + kfree(edid); return ret; } diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index a680c42..5f19116 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c @@ -506,8 +506,7 @@ static struct ib_fmr *nes_alloc_fmr(struct ib_pd *ibpd, nesfmr->root_vpbl.leaf_vpbl[i].pbl_pbase); } } - if (nesfmr->root_vpbl.leaf_vpbl) - kfree(nesfmr->root_vpbl.leaf_vpbl); + kfree(nesfmr->root_vpbl.leaf_vpbl); failed_leaf_vpbl_alloc: if (nesfmr->leaf_pbl_cnt == 0) { diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c index abbe206..1340f93 100644 --- a/drivers/macintosh/windfarm_pm81.c +++ b/drivers/macintosh/windfarm_pm81.c @@ -757,10 +757,8 @@ static int __devexit wf_smu_remove(struct platform_device *ddev) wf_put_control(cpufreq_clamp); /* Destroy control loops state structures */ - if (wf_smu_sys_fans) - kfree(wf_smu_sys_fans); - if (wf_smu_cpu_fans) - kfree(wf_smu_cpu_fans); + kfree(wf_smu_sys_fans); + kfree(wf_smu_cpu_fans); return 0; } diff --git a/drivers/macintosh/windfarm_pm91.c b/drivers/macintosh/windfarm_pm91.c index 764c525..c6e1b24 100644 --- a/drivers/macintosh/windfarm_pm91.c +++ b/drivers/macintosh/windfarm_pm91.c @@ -691,8 +691,7 @@ static int __devexit wf_smu_remove(struct platform_device *ddev) kfree(wf_smu_cpu_fans); if (wf_smu_drive_fans) kfree(wf_smu_cpu_fans); - if (wf_smu_cpu_fans) - kfree(wf_smu_cpu_fans); + kfree(wf_smu_cpu_fans); return 0; } diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c index 9cd51ac..17919eb 100644 --- a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c +++ b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c @@ -295,8 +295,7 @@ static int cinergyt2_fe_get_frontend(struct dvb_frontend *fe, static void cinergyt2_fe_release(struct dvb_frontend *fe) { struct cinergyt2_fe_state *state = fe->demodulator_priv; - if (state != NULL) - kfree(state); + kfree(state); } static struct dvb_frontend_ops cinergyt2_fe_ops; diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c index fa6a623..8eeb144 100644 --- a/drivers/media/dvb/siano/smscoreapi.c +++ b/drivers/media/dvb/siano/smscoreapi.c @@ -723,8 +723,7 @@ void smscore_unregister_device(struct smscore_device_t *coredev) dma_free_coherent(NULL, coredev->common_buffer_size, coredev->common_buffer, coredev->common_buffer_phys); - if (coredev->fw_buf != NULL) - kfree(coredev->fw_buf); + kfree(coredev->fw_buf); list_del(&coredev->entry); kfree(coredev); diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index fa6bb85..ca055cb 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c @@ -1124,8 +1124,7 @@ static void ivtvfb_release_buffers (struct ivtv *itv) fb_dealloc_cmap(&oi->ivtvfb_info.cmap); /* Release pseudo palette */ - if (oi->ivtvfb_info.pseudo_palette) - kfree(oi->ivtvfb_info.pseudo_palette); + kfree(oi->ivtvfb_info.pseudo_palette); #ifdef CONFIG_MTRR if (oi->fb_end_aligned_physaddr) { diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c index ebf6ae0..763b23b 100644 --- a/drivers/message/fusion/mptfc.c +++ b/drivers/message/fusion/mptfc.c @@ -519,8 +519,7 @@ mptfc_target_destroy(struct scsi_target *starget) if (ri) /* better be! */ ri->starget = NULL; } - if (starget->hostdata) - kfree(starget->hostdata); + kfree(starget->hostdata); starget->hostdata = NULL; } diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index 69f4257..e5d09cf 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c @@ -456,8 +456,7 @@ static int mptspi_target_alloc(struct scsi_target *starget) static void mptspi_target_destroy(struct scsi_target *starget) { - if (starget->hostdata) - kfree(starget->hostdata); + kfree(starget->hostdata); starget->hostdata = NULL; } diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index 49e5823..22c0b30 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c @@ -204,15 +204,12 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock return 0; free_bounce_sg: - if (mq->bounce_sg) - kfree(mq->bounce_sg); + kfree(mq->bounce_sg); mq->bounce_sg = NULL; cleanup_queue: - if (mq->sg) - kfree(mq->sg); + kfree(mq->sg); mq->sg = NULL; - if (mq->bounce_buf) - kfree(mq->bounce_buf); + kfree(mq->bounce_buf); mq->bounce_buf = NULL; blk_cleanup_queue(mq->queue); return ret; @@ -234,15 +231,13 @@ void mmc_cleanup_queue(struct mmc_queue *mq) /* Then terminate our worker thread */ kthread_stop(mq->thread); - if (mq->bounce_sg) - kfree(mq->bounce_sg); + kfree(mq->bounce_sg); mq->bounce_sg = NULL; kfree(mq->sg); mq->sg = NULL; - if (mq->bounce_buf) - kfree(mq->bounce_buf); + kfree(mq->bounce_buf); mq->bounce_buf = NULL; blk_cleanup_queue(mq->queue); diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index bdb165f..0211e98 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c @@ -187,8 +187,7 @@ static void mmc_release_card(struct device *dev) sdio_free_common_cis(card); - if (card->info) - kfree(card->info); + kfree(card->info); kfree(card); } diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c index d37464e..3a7b6f3 100644 --- a/drivers/mmc/core/sdio_bus.c +++ b/drivers/mmc/core/sdio_bus.c @@ -201,8 +201,7 @@ static void sdio_release_func(struct device *dev) sdio_free_func_cis(func); - if (func->info) - kfree(func->info); + kfree(func->info); kfree(func); } diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index e7563a9..470c0d9 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -2595,8 +2595,7 @@ static void cfi_intelext_destroy(struct mtd_info *mtd) kfree(cfi); for (i = 0; i < mtd->numeraseregions; i++) { region = &mtd->eraseregions[i]; - if (region->lockmap) - kfree(region->lockmap); + kfree(region->lockmap); } kfree(mtd->eraseregions); } diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c index 424f17d..080401c 100644 --- a/drivers/mtd/maps/ck804xrom.c +++ b/drivers/mtd/maps/ck804xrom.c @@ -310,8 +310,7 @@ static int __devinit ck804xrom_init_one (struct pci_dev *pdev, out: /* Free any left over map structures */ - if (map) - kfree(map); + kfree(map); /* See if I have any map structures */ if (list_empty(&window->maps)) { diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index e1da466..71e1bcc 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -1012,10 +1012,8 @@ static void free_rings(struct net_device *dev) pci_free_consistent(np->pci_dev, sizeof(struct ring_desc_ex) * (np->rx_ring_size + np->tx_ring_size), np->rx_ring.ex, np->ring_addr); } - if (np->rx_skb) - kfree(np->rx_skb); - if (np->tx_skb) - kfree(np->tx_skb); + kfree(np->rx_skb); + kfree(np->tx_skb); } static int using_multi_irqs(struct net_device *dev) @@ -4650,10 +4648,8 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri pci_free_consistent(np->pci_dev, sizeof(struct ring_desc_ex) * (ring->rx_pending + ring->tx_pending), rxtx_ring, ring_addr); } - if (rx_skbuff) - kfree(rx_skbuff); - if (tx_skbuff) - kfree(tx_skbuff); + kfree(rx_skbuff); + kfree(tx_skbuff); goto exit; } diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c index cb90d64..608fa47 100644 --- a/drivers/net/irda/kingsun-sir.c +++ b/drivers/net/irda/kingsun-sir.c @@ -544,8 +544,8 @@ static int kingsun_probe(struct usb_interface *intf, return 0; free_mem: - if (kingsun->out_buf) kfree(kingsun->out_buf); - if (kingsun->in_buf) kfree(kingsun->in_buf); + kfree(kingsun->out_buf); + kfree(kingsun->in_buf); free_netdev(net); err_out1: return ret; diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 6930c87..9298586 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -4058,8 +4058,7 @@ static void myri10ge_remove(struct pci_dev *pdev) mtrr_del(mgp->mtrr, mgp->iomem_base, mgp->board_span); #endif myri10ge_free_slices(mgp); - if (mgp->msix_vectors != NULL) - kfree(mgp->msix_vectors); + kfree(mgp->msix_vectors); dma_free_coherent(&pdev->dev, sizeof(*mgp->cmd), mgp->cmd, mgp->cmd_bus); diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 7fc15e9..a5aa996 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -170,8 +170,7 @@ netxen_alloc_sds_rings(struct netxen_recv_context *recv_ctx, int count) static void netxen_free_sds_rings(struct netxen_recv_context *recv_ctx) { - if (recv_ctx->sds_rings != NULL) - kfree(recv_ctx->sds_rings); + kfree(recv_ctx->sds_rings); recv_ctx->sds_rings = NULL; } diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c index 88f03c9..2f9ebbd 100644 --- a/drivers/net/ppp_mppe.c +++ b/drivers/net/ppp_mppe.c @@ -238,8 +238,7 @@ static void *mppe_alloc(unsigned char *options, int optlen) return (void *)state; out_free: - if (state->sha1_digest) - kfree(state->sha1_digest); + kfree(state->sha1_digest); if (state->sha1) crypto_free_hash(state->sha1); if (state->arc4) @@ -256,8 +255,7 @@ static void mppe_free(void *arg) { struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; if (state) { - if (state->sha1_digest) - kfree(state->sha1_digest); + kfree(state->sha1_digest); if (state->sha1) crypto_free_hash(state->sha1); if (state->arc4) diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index 4c61051..52633d8 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c @@ -2755,7 +2755,7 @@ static void ql_free_buffer_queues(struct ql3_adapter *qdev) "%s: Already done.\n", qdev->ndev->name); return; } - if(qdev->lrg_buf) kfree(qdev->lrg_buf); + kfree(qdev->lrg_buf); pci_free_consistent(qdev->pdev, qdev->lrg_buf_q_alloc_size, qdev->lrg_buf_q_alloc_virt_addr, diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index c2f14dc..60d2fee 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c @@ -1130,8 +1130,7 @@ static int stmmac_release(struct net_device *dev) #ifdef CONFIG_STMMAC_TIMER /* Stop and release the timer */ stmmac_close_ext_timer(); - if (priv->tm != NULL) - kfree(priv->tm); + kfree(priv->tm); #endif napi_disable(&priv->napi); skb_queue_purge(&priv->rx_recycle); diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index fa4e581..3c2dbbe 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -2798,8 +2798,7 @@ exit: tty_unregister_device(tty_drv, serial->minor); kfree(serial); } - if (hso_dev) - kfree(hso_dev); + kfree(hso_dev); return NULL; } diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c index 71a1bd2..698a09a 100644 --- a/drivers/net/wireless/ath/ath5k/attach.c +++ b/drivers/net/wireless/ath/ath5k/attach.c @@ -363,8 +363,7 @@ void ath5k_hw_detach(struct ath5k_hw *ah) __set_bit(ATH_STAT_INVALID, ah->ah_sc->status); - if (ah->ah_rf_banks != NULL) - kfree(ah->ah_rf_banks); + kfree(ah->ah_rf_banks); ath5k_eeprom_detach(ah); diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c index a0e9f6a..c64a665 100644 --- a/drivers/net/wireless/ipw2x00/libipw_module.c +++ b/drivers/net/wireless/ipw2x00/libipw_module.c @@ -101,8 +101,7 @@ static inline void libipw_networks_free(struct libipw_device *ieee) return; for (i = 0; i < MAX_NETWORK_COUNT; i++) - if (ieee->networks[i].ibss_dfs) - kfree(ieee->networks[i].ibss_dfs); + kfree(ieee->networks[i].ibss_dfs); kfree(ieee->networks); ieee->networks = NULL; diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c index 33921a6..2889a0f 100644 --- a/drivers/rtc/rtc-m48t59.c +++ b/drivers/rtc/rtc-m48t59.c @@ -504,8 +504,7 @@ out: free_irq(m48t59->irq, &pdev->dev); if (m48t59->ioaddr) iounmap(m48t59->ioaddr); - if (m48t59) - kfree(m48t59); + kfree(m48t59); return ret; } diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c index 89ece1c..6ad54f3 100644 --- a/drivers/s390/char/monreader.c +++ b/drivers/s390/char/monreader.c @@ -174,8 +174,7 @@ static void mon_free_mem(struct mon_private *monpriv) int i; for (i = 0; i < MON_MSGLIM; i++) - if (monpriv->msg_array[i]) - kfree(monpriv->msg_array[i]); + kfree(monpriv->msg_array[i]); kfree(monpriv); } diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l b/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l index 93c8667..1ffe8fa 100644 --- a/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l +++ b/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l @@ -606,8 +606,7 @@ yywrap() yy_delete_buffer(YY_CURRENT_BUFFER); (void)fclose(yyin); - if (yyfilename != NULL) - free(yyfilename); + free(yyfilename); yyfilename = NULL; include = include_stack.slh_first; if (include != NULL) { diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c index 078ed60..5b9edb6 100644 --- a/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c +++ b/drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c @@ -95,12 +95,10 @@ symbol_delete(symbol_t *symbol) case SCBLOC: case SRAMLOC: case REGISTER: - if (symbol->info.rinfo != NULL) - free(symbol->info.rinfo); + free(symbol->info.rinfo); break; case ALIAS: - if (symbol->info.ainfo != NULL) - free(symbol->info.ainfo); + free(symbol->info.ainfo); break; case MASK: case FIELD: @@ -113,12 +111,10 @@ symbol_delete(symbol_t *symbol) break; case DOWNLOAD_CONST: case CONST: - if (symbol->info.cinfo != NULL) - free(symbol->info.cinfo); + free(symbol->info.cinfo); break; case LABEL: - if (symbol->info.linfo != NULL) - free(symbol->info.linfo); + free(symbol->info.linfo); break; case UNINITIALIZED: default: diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index 996f722..fa4e67b 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c @@ -598,8 +598,7 @@ static void asd_destroy_ha_caches(struct asd_ha_struct *asd_ha) if (asd_ha->hw_prof.scb_ext) asd_free_coherent(asd_ha, asd_ha->hw_prof.scb_ext); - if (asd_ha->hw_prof.ddb_bitmap) - kfree(asd_ha->hw_prof.ddb_bitmap); + kfree(asd_ha->hw_prof.ddb_bitmap); asd_ha->hw_prof.ddb_bitmap = NULL; for (i = 0; i < ASD_MAX_PHYS; i++) { diff --git a/drivers/staging/altpciechdma/altpciechdma.c b/drivers/staging/altpciechdma/altpciechdma.c index e0c5ba4..1d7ff80 100644 --- a/drivers/staging/altpciechdma/altpciechdma.c +++ b/drivers/staging/altpciechdma/altpciechdma.c @@ -941,8 +941,7 @@ err_enable: pci_free_consistent(dev, APE_CHDMA_TABLE_SIZE, ape->table_virt, ape->table_bus); /* clean up everything before allocating descriptor table */ err_table: - if (ape) - kfree(ape); + kfree(ape); err_ape: end: return rc; diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c index 69ab281..5f08263 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/drivers/staging/comedi/drivers/amplc_dio200.c @@ -1014,9 +1014,7 @@ dio200_subdev_intr_cleanup(struct comedi_device *dev, { struct dio200_subdev_intr *subpriv = s->private; - if (subpriv) { - kfree(subpriv); - } + kfree(subpriv); } /* @@ -1267,9 +1265,7 @@ dio200_subdev_8254_cleanup(struct comedi_device *dev, { struct dio200_subdev_intr *subpriv = s->private; - if (subpriv) { - kfree(subpriv); - } + kfree(subpriv); } /* diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c index d983687..b41e5e5 100644 --- a/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/drivers/staging/comedi/drivers/amplc_pci224.c @@ -1536,20 +1536,12 @@ static int pci224_detach(struct comedi_device *dev) s = dev->subdevices + 0; /* AO subdevice */ - if (s->range_table_list) { - kfree(s->range_table_list); - } + kfree(s->range_table_list); } if (devpriv) { - if (devpriv->ao_readback) { - kfree(devpriv->ao_readback); - } - if (devpriv->ao_scan_vals) { - kfree(devpriv->ao_scan_vals); - } - if (devpriv->ao_scan_order) { - kfree(devpriv->ao_scan_order); - } + kfree(devpriv->ao_readback); + kfree(devpriv->ao_scan_vals); + kfree(devpriv->ao_scan_order); if (devpriv->pci_dev) { if (dev->iobase) { comedi_pci_disable(devpriv->pci_dev); diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index 80c0df8..1662072 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -767,8 +767,7 @@ static void das16cs_pcmcia_detach(struct pcmcia_device *link) das16cs_pcmcia_release(link); } /* This points to the parent struct local_info_t struct */ - if (link->priv) - kfree(link->priv); + kfree(link->priv); } /* das16cs_pcmcia_detach */ static void das16cs_pcmcia_config(struct pcmcia_device *link) diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c index 9cab21e..3d65edc 100644 --- a/drivers/staging/comedi/drivers/das08_cs.c +++ b/drivers/staging/comedi/drivers/das08_cs.c @@ -232,8 +232,7 @@ static void das08_pcmcia_detach(struct pcmcia_device *link) } /* This points to the parent struct local_info_t struct */ - if (link->priv) - kfree(link->priv); + kfree(link->priv); } /* das08_pcmcia_detach */ diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index 10a87e6..a259130 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c @@ -1673,10 +1673,8 @@ static int das16_detach(struct comedi_device *dev) } if (devpriv->dma_chan) free_dma(devpriv->dma_chan); - if (devpriv->user_ai_range_table) - kfree(devpriv->user_ai_range_table); - if (devpriv->user_ao_range_table) - kfree(devpriv->user_ao_range_table); + kfree(devpriv->user_ai_range_table); + kfree(devpriv->user_ao_range_table); } if (dev->irq) diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c index 6ea59cc..b3456a6 100644 --- a/drivers/staging/comedi/drivers/das1800.c +++ b/drivers/staging/comedi/drivers/das1800.c @@ -796,10 +796,8 @@ static int das1800_detach(struct comedi_device *dev) free_dma(devpriv->dma0); if (devpriv->dma1) free_dma(devpriv->dma1); - if (devpriv->ai_buf0) - kfree(devpriv->ai_buf0); - if (devpriv->ai_buf1) - kfree(devpriv->ai_buf1); + kfree(devpriv->ai_buf0); + kfree(devpriv->ai_buf1); } printk("comedi%d: %s: remove\n", dev->minor, diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c index 9b43547..d99670e 100644 --- a/drivers/staging/comedi/drivers/ni_670x.c +++ b/drivers/staging/comedi/drivers/ni_670x.c @@ -219,9 +219,7 @@ static int ni_670x_detach(struct comedi_device *dev) { printk("comedi%d: ni_670x: remove\n", dev->minor); - if (dev->subdevices[0].range_table_list) { - kfree(dev->subdevices[0].range_table_list); - } + kfree(dev->subdevices[0].range_table_list); if (dev->private && devpriv->mite) mite_unsetup(devpriv->mite); diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c index dd75dfb..9104b27 100644 --- a/drivers/staging/comedi/drivers/ni_at_a2150.c +++ b/drivers/staging/comedi/drivers/ni_at_a2150.c @@ -467,8 +467,7 @@ static int a2150_detach(struct comedi_device *dev) if (devpriv) { if (devpriv->dma) free_dma(devpriv->dma); - if (devpriv->dma_buffer) - kfree(devpriv->dma_buffer); + kfree(devpriv->dma_buffer); } return 0; diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index ec31a39..5f37827 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -563,8 +563,7 @@ static void dio700_cs_detach(struct pcmcia_device *link) } /* This points to the parent struct local_info_t struct */ - if (link->priv) - kfree(link->priv); + kfree(link->priv); } /* dio700_cs_detach */ diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index 0700a8b..daeaa31 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -314,8 +314,7 @@ static void dio24_cs_detach(struct pcmcia_device *link) } /* This points to the parent local_info_t struct */ - if (link->priv) - kfree(link->priv); + kfree(link->priv); } /* dio24_cs_detach */ diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index dc3f398..a8590eb 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -746,8 +746,7 @@ int labpc_common_detach(struct comedi_device *dev) subdev_8255_cleanup(dev, dev->subdevices + 2); /* only free stuff if it has been allocated by _attach */ - if (devpriv->dma_buffer) - kfree(devpriv->dma_buffer); + kfree(devpriv->dma_buffer); if (devpriv->dma_chan) free_dma(devpriv->dma_chan); if (dev->irq) diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index a3053b8..8589379 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c @@ -292,8 +292,7 @@ static void labpc_cs_detach(struct pcmcia_device *link) } /* This points to the parent local_info_t struct */ - if (link->priv) - kfree(link->priv); + kfree(link->priv); } /* labpc_cs_detach */ diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 344b823..ecdbd3b 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -1121,8 +1121,7 @@ static void daqp_cs_detach(struct pcmcia_device *link) /* Unlink device structure, and free it */ dev_table[dev->table_index] = NULL; - if (dev) - kfree(dev); + kfree(dev); } /* daqp_cs_detach */ diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c index 82aa86e..0f820c4 100644 --- a/drivers/staging/comedi/drivers/serial2002.c +++ b/drivers/staging/comedi/drivers/serial2002.c @@ -636,15 +636,14 @@ static void serial_2002_open(struct comedi_device *dev) s = &dev->subdevices[i]; s->n_chan = chan; s->maxdata = 0; - if (s->maxdata_list) { - kfree(s->maxdata_list); - } + kfree(s->maxdata_list); s->maxdata_list = maxdata_list = kmalloc(sizeof(unsigned int) * s->n_chan, GFP_KERNEL); - if (s->range_table_list) { - kfree(s->range_table_list); - } + kfree(s->range_table_list); + kmalloc(sizeof(unsigned int) * s->n_chan, + GFP_KERNEL); + kfree(s->range_table_list); if (range) { s->range_table = 0; s->range_table_list = range_table_list = @@ -885,12 +884,8 @@ static int serial2002_detach(struct comedi_device *dev) printk("comedi%d: serial2002: remove\n", dev->minor); for (i = 0; i < 4; i++) { s = &dev->subdevices[i]; - if (s->maxdata_list) { - kfree(s->maxdata_list); - } - if (s->range_table_list) { - kfree(s->range_table_list); - } + kfree(s->maxdata_list); + kfree(s->range_table_list); } return 0; } diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c index ddddf65..8e4f53f 100644 --- a/drivers/staging/cx25821/cx25821-audio-upstream.c +++ b/drivers/staging/cx25821/cx25821-audio-upstream.c @@ -246,8 +246,7 @@ void cx25821_stop_upstream_audio(struct cx25821_dev *dev) dev->_irq_audio_queues = NULL; } - if (dev->_audiofilename != NULL) - kfree(dev->_audiofilename); + kfree(dev->_audiofilename); } void cx25821_free_mem_upstream_audio(struct cx25821_dev *dev) diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c index c8905e0..b2bd5d9 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c +++ b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c @@ -234,8 +234,7 @@ void cx25821_stop_upstream_video_ch2(struct cx25821_dev *dev) dev->_irq_queues_ch2 = NULL; } - if (dev->_filename_ch2 != NULL) - kfree(dev->_filename_ch2); + kfree(dev->_filename_ch2); tmp = cx_read(VID_CH_MODE_SEL); cx_write(VID_CH_MODE_SEL, tmp & 0xFFFFFE00); diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/staging/cx25821/cx25821-video-upstream.c index 3d7dd3f..67eb898 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream.c +++ b/drivers/staging/cx25821/cx25821-video-upstream.c @@ -282,8 +282,7 @@ void cx25821_stop_upstream_video_ch1(struct cx25821_dev *dev) dev->_irq_queues = NULL; } - if (dev->_filename != NULL) - kfree(dev->_filename); + kfree(dev->_filename); tmp = cx_read(VID_CH_MODE_SEL); cx_write(VID_CH_MODE_SEL, tmp & 0xFFFFFE00); diff --git a/drivers/staging/dream/camera/msm_camera.c b/drivers/staging/dream/camera/msm_camera.c index 8816599..dfed579 100644 --- a/drivers/staging/dream/camera/msm_camera.c +++ b/drivers/staging/dream/camera/msm_camera.c @@ -591,8 +591,7 @@ end: * a result of a successful completion, we are freeing the qcmd that * we dequeued from queue->ctrl_status_q. */ - if (qcmd) - kfree(qcmd); + kfree(qcmd); CDBG("msm_control: end rc = %d\n", rc); return rc; @@ -795,8 +794,7 @@ static int msm_get_stats(struct msm_sync *sync, void __user *arg) } failure: - if (qcmd) - kfree(qcmd); + kfree(qcmd); CDBG("msm_get_stats: %d\n", rc); return rc; @@ -1930,7 +1928,7 @@ static int __msm_v4l2_control(struct msm_sync *sync, memcpy(out->value, ctrl->value, ctrl->length); end: - if (rcmd) kfree(rcmd); + kfree(rcmd); CDBG("__msm_v4l2_control: end rc = %d\n", rc); return rc; } diff --git a/drivers/staging/dream/camera/msm_vfe7x.c b/drivers/staging/dream/camera/msm_vfe7x.c index 5de96c5..4eb3474 100644 --- a/drivers/staging/dream/camera/msm_vfe7x.c +++ b/drivers/staging/dream/camera/msm_vfe7x.c @@ -679,8 +679,7 @@ config_send: cmd_data, vfecmd->length); config_done: - if (cmd_data_alloc != NULL) - kfree(cmd_data_alloc); + kfree(cmd_data_alloc); config_failure: kfree(scfg); diff --git a/drivers/staging/go7007/go7007-usb.c b/drivers/staging/go7007/go7007-usb.c index ecaa3c9..bf4fa16 100644 --- a/drivers/staging/go7007/go7007-usb.c +++ b/drivers/staging/go7007/go7007-usb.c @@ -1246,15 +1246,13 @@ static void go7007_usb_disconnect(struct usb_interface *intf) vurb = usb->video_urbs[i]; if (vurb) { usb_kill_urb(vurb); - if (vurb->transfer_buffer) - kfree(vurb->transfer_buffer); + kfree(vurb->transfer_buffer); usb_free_urb(vurb); } aurb = usb->audio_urbs[i]; if (aurb) { usb_kill_urb(aurb); - if (aurb->transfer_buffer) - kfree(aurb->transfer_buffer); + kfree(aurb->transfer_buffer); usb_free_urb(aurb); } } diff --git a/drivers/staging/pohmelfs/config.c b/drivers/staging/pohmelfs/config.c index 5d04bf5..51b1521 100644 --- a/drivers/staging/pohmelfs/config.c +++ b/drivers/staging/pohmelfs/config.c @@ -607,11 +607,9 @@ void pohmelfs_config_exit(void) list_del(&g->group_entry); - if (g->hash_string) - kfree(g->hash_string); + kfree(g->hash_string); - if (g->cipher_string) - kfree(g->cipher_string); + kfree(g->cipher_string); kfree(g); } diff --git a/drivers/staging/rt2860/common/spectrum.c b/drivers/staging/rt2860/common/spectrum.c index c658bf3..3e6864c 100644 --- a/drivers/staging/rt2860/common/spectrum.c +++ b/drivers/staging/rt2860/common/spectrum.c @@ -59,8 +59,7 @@ VOID MeasureReqTabExit( { NdisFreeSpinLock(pAd->CommonCfg.MeasureReqTabLock); - if (pAd->CommonCfg.pMeasureReqTab) - kfree(pAd->CommonCfg.pMeasureReqTab); + kfree(pAd->CommonCfg.pMeasureReqTab); pAd->CommonCfg.pMeasureReqTab = NULL; return; @@ -277,8 +276,7 @@ VOID TpcReqTabExit( { NdisFreeSpinLock(pAd->CommonCfg.TpcReqTabLock); - if (pAd->CommonCfg.pTpcReqTab) - kfree(pAd->CommonCfg.pTpcReqTab); + kfree(pAd->CommonCfg.pTpcReqTab); pAd->CommonCfg.pTpcReqTab = NULL; return; diff --git a/drivers/staging/rt3090/common/crypt_biginteger.c b/drivers/staging/rt3090/common/crypt_biginteger.c index b346c5f..194769e 100644 --- a/drivers/staging/rt3090/common/crypt_biginteger.c +++ b/drivers/staging/rt3090/common/crypt_biginteger.c @@ -1108,8 +1108,7 @@ VOID BigInteger_Montgomery_ExpMod ( BigInteger_Free(&pBI_O); for(Index = 0; Index < SLIDING_WINDOW; Index++) BigInteger_Free(&pBI_A[Index]); - if (pRValue != NULL) - kfree(pRValue); + kfree(pRValue); memory_free: BigInteger_Free(&pBI_Temp1); diff --git a/drivers/staging/rt3090/common/ee_efuse.c b/drivers/staging/rt3090/common/ee_efuse.c index c51e305..0fc0a9b 100644 --- a/drivers/staging/rt3090/common/ee_efuse.c +++ b/drivers/staging/rt3090/common/ee_efuse.c @@ -958,8 +958,7 @@ recoverFS: RtmpOSFSInfoChange(&osfsInfo, FALSE); - if (memPtr) - kfree(memPtr); + kfree(memPtr); return retval; } diff --git a/drivers/staging/rt3090/common/rtmp_mcu.c b/drivers/staging/rt3090/common/rtmp_mcu.c index 23f785a..0c71e43 100644 --- a/drivers/staging/rt3090/common/rtmp_mcu.c +++ b/drivers/staging/rt3090/common/rtmp_mcu.c @@ -288,8 +288,7 @@ NDIS_STATUS RtmpAsicLoadFirmware( if (flg_default_firm_use == TRUE) { /* use default fimeware, free allocated buffer */ - if (pFirmwareImage != NULL) - kfree(pFirmwareImage); + kfree(pFirmwareImage); /* End of if */ /* use default *.bin array */ @@ -320,8 +319,7 @@ NDIS_STATUS RtmpAsicLoadFirmware( if (flg_default_firm_use == FALSE) { /* use file firmware, free allocated buffer */ - if (pFirmwareImage != NULL) - kfree(pFirmwareImage); + kfree(pFirmwareImage); /* End of if */ } /* End of if */ diff --git a/drivers/staging/rt3090/common/spectrum.c b/drivers/staging/rt3090/common/spectrum.c index 12d2125..0f46e28 100644 --- a/drivers/staging/rt3090/common/spectrum.c +++ b/drivers/staging/rt3090/common/spectrum.c @@ -301,8 +301,7 @@ VOID MeasureReqTabExit( { NdisFreeSpinLock(&pAd->CommonCfg.MeasureReqTabLock); - if (pAd->CommonCfg.pMeasureReqTab) - kfree(pAd->CommonCfg.pMeasureReqTab); + kfree(pAd->CommonCfg.pMeasureReqTab); pAd->CommonCfg.pMeasureReqTab = NULL; return; @@ -519,8 +518,7 @@ VOID TpcReqTabExit( { NdisFreeSpinLock(&pAd->CommonCfg.TpcReqTabLock); - if (pAd->CommonCfg.pTpcReqTab) - kfree(pAd->CommonCfg.pTpcReqTab); + kfree(pAd->CommonCfg.pTpcReqTab); pAd->CommonCfg.pTpcReqTab = NULL; return; diff --git a/drivers/staging/rt3090/rt_ate.c b/drivers/staging/rt3090/rt_ate.c index 259aae4..48e0db9 100644 --- a/drivers/staging/rt3090/rt_ate.c +++ b/drivers/staging/rt3090/rt_ate.c @@ -4298,8 +4298,7 @@ VOID RtmpDoAte( ASSERT(pRaCfg != NULL); - if (pRaCfg != NULL) - kfree(pRaCfg); + kfree(pRaCfg); return; } diff --git a/drivers/staging/rt3090/rt_linux.c b/drivers/staging/rt3090/rt_linux.c index 9b94aa6..78adcd2 100644 --- a/drivers/staging/rt3090/rt_linux.c +++ b/drivers/staging/rt3090/rt_linux.c @@ -277,8 +277,7 @@ VOID RTMPFreeAdapter( os_cookie=(POS_COOKIE)pAd->OS_Cookie; - if (pAd->BeaconBuf) - kfree(pAd->BeaconBuf); + kfree(pAd->BeaconBuf); NdisFreeSpinLock(&pAd->MgmtRingLock); @@ -301,8 +300,7 @@ NdisFreeSpinLock(&pAd->McuCmdLock); vfree(pAd); // pci_free_consistent(os_cookie->pci_dev,sizeof(RTMP_ADAPTER),pAd,os_cookie->pAd_pa); - if (os_cookie) - kfree(os_cookie); + kfree(os_cookie); } BOOLEAN OS_Need_Clone_Packet(void) diff --git a/drivers/staging/rt3090/sta_ioctl.c b/drivers/staging/rt3090/sta_ioctl.c index b8ab84a..d0a192a 100644 --- a/drivers/staging/rt3090/sta_ioctl.c +++ b/drivers/staging/rt3090/sta_ioctl.c @@ -4572,8 +4572,7 @@ INT RTMPSetInformation( } } } - if(pPmkId) - kfree(pPmkId); + kfree(pPmkId); break; #endif // WPA_SUPPLICANT_SUPPORT // @@ -5497,8 +5496,7 @@ INT RTMPQueryInformation( Status = copy_to_user(wrq->u.data.pointer, pChListBuf, sizeof(RT_CHANNEL_LIST_INFO)); DBGPRINT(RT_DEBUG_TRACE, ("Status=%d\n", Status)); - if (pChListBuf) - kfree(pChListBuf); + kfree(pChListBuf); } break; @@ -5540,8 +5538,7 @@ INT RTMPQueryInformation( Status = copy_to_user(wrq->u.data.pointer, pDlsInfo, wrq->u.data.length); DBGPRINT(RT_DEBUG_TRACE, ("Query::RT_OID_802_11_QUERY_DLS_PARAM\n")); - if (pDlsInfo) - kfree(pDlsInfo); + kfree(pDlsInfo); } break; #endif // QOS_DLS_SUPPORT // diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c index 59b2ab4..1d001ec 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c @@ -2600,8 +2600,7 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee) cancel_delayed_work(&ieee->GPIOChangeRFWorkItem); destroy_workqueue(ieee->wq); - if(NULL != ieee->pDot11dInfo) - kfree(ieee->pDot11dInfo); + kfree(ieee->pDot11dInfo); up(&ieee->wx_sem); } diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c index 8d8bdd0..a70c645 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c @@ -744,7 +744,6 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) ieee->wpa_ie_len = len; } else{ - if (ieee->wpa_ie) kfree(ieee->wpa_ie); ieee->wpa_ie = NULL; ieee->wpa_ie_len = 0; diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c index 2234831..cb04162 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c @@ -999,7 +999,6 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) ieee->wpa_ie_len = len; } else{ - if (ieee->wpa_ie) kfree(ieee->wpa_ie); ieee->wpa_ie = NULL; ieee->wpa_ie_len = 0; diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c index 1077590..36492ec 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c @@ -784,7 +784,6 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) ieee->wpa_ie_len = len; } else{ - if (ieee->wpa_ie) kfree(ieee->wpa_ie); ieee->wpa_ie = NULL; ieee->wpa_ie_len = 0; diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c index 52af44c..38ffaad 100644 --- a/drivers/staging/serqt_usb2/serqt_usb2.c +++ b/drivers/staging/serqt_usb2/serqt_usb2.c @@ -1098,8 +1098,7 @@ static void qt_close(struct usb_serial_port *port) if (qt_port->write_urb) { /* if this urb had a transfer buffer already (old tx) free it */ - if (qt_port->write_urb->transfer_buffer != NULL) - kfree(qt_port->write_urb->transfer_buffer); + kfree(qt_port->write_urb->transfer_buffer); usb_free_urb(qt_port->write_urb); } diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c index ba1678f..7a4e882 100644 --- a/drivers/staging/usbip/stub_main.c +++ b/drivers/staging/usbip/stub_main.c @@ -223,11 +223,9 @@ void stub_device_cleanup_urbs(struct stub_device *sdev) kmem_cache_free(stub_priv_cache, priv); - if (urb->transfer_buffer != NULL) - kfree(urb->transfer_buffer); + kfree(urb->transfer_buffer); - if (urb->setup_packet != NULL) - kfree(urb->setup_packet); + kfree(urb->setup_packet); usb_free_urb(urb); } diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c index e139eae..aa221b3 100644 --- a/drivers/staging/vme/bridges/vme_ca91cx42.c +++ b/drivers/staging/vme/bridges/vme_ca91cx42.c @@ -567,8 +567,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image, if (existing_size != 0) { iounmap(image->kern_base); image->kern_base = NULL; - if (image->pci_resource.name != NULL) - kfree(image->pci_resource.name); + kfree(image->pci_resource.name); release_resource(&(image->pci_resource)); memset(&(image->pci_resource), 0, sizeof(struct resource)); } diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c index 00fe080..9d7ed27 100644 --- a/drivers/staging/vme/bridges/vme_tsi148.c +++ b/drivers/staging/vme/bridges/vme_tsi148.c @@ -897,8 +897,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, if (existing_size != 0) { iounmap(image->kern_base); image->kern_base = NULL; - if (image->pci_resource.name != NULL) - kfree(image->pci_resource.name); + kfree(image->pci_resource.name); release_resource(&(image->pci_resource)); memset(&(image->pci_resource), 0, sizeof(struct resource)); } diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 53450b4..c2841b2 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -3058,8 +3058,7 @@ else { } error1: - if(buffer) - kfree(buffer); + kfree(buffer); if(filp_close(filp,NULL)) printk("Config_FileOperation:close file fail\n"); diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c index 58abf44..6216c4b 100644 --- a/drivers/staging/vt6655/hostap.c +++ b/drivers/staging/vt6655/hostap.c @@ -861,8 +861,7 @@ int hostap_ioctl(PSDevice pDevice, struct iw_point *p) } out: - if (param != NULL) - kfree(param); + kfree(param); return ret; } diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c index 574e0b0..70a99b8 100644 --- a/drivers/staging/vt6655/wpactl.c +++ b/drivers/staging/vt6655/wpactl.c @@ -983,8 +983,7 @@ int wpa_ioctl(PSDevice pDevice, struct iw_point *p) } out: - if (param != NULL) - kfree(param); + kfree(param); return ret; } diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c index 52daa3b..8631ad0 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -803,16 +803,14 @@ FIRMWAREbDownload( DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Download firmware...%d %ld\n", ii, sizeof(abyFirmware)); if (NdisStatus != STATUS_SUCCESS) { - if (pBuffer) - kfree(pBuffer); + kfree(pBuffer); spin_lock_irq(&pDevice->lock); return (FALSE); } } } - if (pBuffer) - kfree(pBuffer); + kfree(pBuffer); spin_lock_irq(&pDevice->lock); return (TRUE); diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c index 0c8267a..f00d489 100644 --- a/drivers/staging/vt6656/hostap.c +++ b/drivers/staging/vt6656/hostap.c @@ -860,8 +860,7 @@ int hostap_ioctl(PSDevice pDevice, struct iw_point *p) } out: - if (param != NULL) - kfree(param); + kfree(param); return ret; } diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 7f96bca..0b374cc 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -861,8 +861,7 @@ static VOID device_free_tx_bufs(PSDevice pDevice) { usb_kill_urb(pTxContext->pUrb); usb_free_urb(pTxContext->pUrb); } - if (pTxContext) - kfree(pTxContext); + kfree(pTxContext); } return; } @@ -884,8 +883,7 @@ static VOID device_free_rx_bufs(PSDevice pDevice) { if (pRCB->skb) dev_kfree_skb(pRCB->skb); } - if (pDevice->pRCBMem) - kfree(pDevice->pRCBMem); + kfree(pDevice->pRCBMem); return; } @@ -902,8 +900,7 @@ static void usb_device_reset(PSDevice pDevice) static VOID device_free_int_bufs(PSDevice pDevice) { - if (pDevice->intBuf.pDataBuf != NULL) - kfree(pDevice->intBuf.pDataBuf); + kfree(pDevice->intBuf.pDataBuf); return; } @@ -1539,8 +1536,7 @@ error2: */ if(result!=0) { - if(buffer) - kfree(buffer); + kfree(buffer); buffer=NULL; } return buffer; diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c index 4555bc0..dfa7093 100644 --- a/drivers/staging/vt6656/wpactl.c +++ b/drivers/staging/vt6656/wpactl.c @@ -1000,8 +1000,7 @@ int wpa_ioctl(PSDevice pDevice, struct iw_point *p) } out: - if (param != NULL) - kfree(param); + kfree(param); return ret; } diff --git a/drivers/staging/winbond/wb35reg.c b/drivers/staging/winbond/wb35reg.c index f5608ad..6736936 100644 --- a/drivers/staging/winbond/wb35reg.c +++ b/drivers/staging/winbond/wb35reg.c @@ -65,8 +65,7 @@ Wb35Reg_BurstWrite(struct hw_data * pHwData, u16 RegisterNo, u32 * pRegisterData } else { if (urb) usb_free_urb(urb); - if (reg_queue) - kfree(reg_queue); + kfree(reg_queue); return false; } return false; diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index 7d76a7f..174783c 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -434,9 +434,7 @@ void free_chunks(imgchunk_t *fchunk, unsigned int *nfchunks) { int i; for (i = 0; i < *nfchunks; i++) { - if (fchunk[i].data != NULL) { - kfree(fchunk[i].data); - } + kfree(fchunk[i].data); } *nfchunks = 0; memset(fchunk, 0, sizeof(fchunk)); diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index f11abf5..5e5774b 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -1182,9 +1182,7 @@ static void mos7840_close(struct usb_serial_port *port) /* Freeing Write URBs */ for (j = 0; j < NUM_URBS; ++j) { if (mos7840_port->write_urb_pool[j]) { - if (mos7840_port->write_urb_pool[j]->transfer_buffer) - kfree(mos7840_port->write_urb_pool[j]-> - transfer_buffer); + kfree(mos7840_port->write_urb_pool[j]->transfer_buffer); usb_free_urb(mos7840_port->write_urb_pool[j]); } @@ -1221,8 +1219,7 @@ static void mos7840_close(struct usb_serial_port *port) if (mos7840_port->write_urb) { /* if this urb had a transfer buffer already (old tx) free it */ - if (mos7840_port->write_urb->transfer_buffer != NULL) - kfree(mos7840_port->write_urb->transfer_buffer); + kfree(mos7840_port->write_urb->transfer_buffer); usb_free_urb(mos7840_port->write_urb); } diff --git a/drivers/uwb/wlp/wlp-lc.c b/drivers/uwb/wlp/wlp-lc.c index 13db739..4c5eff2 100644 --- a/drivers/uwb/wlp/wlp-lc.c +++ b/drivers/uwb/wlp/wlp-lc.c @@ -538,8 +538,7 @@ void wlp_remove(struct wlp *wlp) uwb_notifs_deregister(wlp->rc, &wlp->uwb_notifs_handler); wlp_eda_release(&wlp->eda); mutex_lock(&wlp->mutex); - if (wlp->dev_info != NULL) - kfree(wlp->dev_info); + kfree(wlp->dev_info); mutex_unlock(&wlp->mutex); wlp->rc = NULL; } diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c index 0d96f1d..b4df611 100644 --- a/drivers/video/au1200fb.c +++ b/drivers/video/au1200fb.c @@ -1708,8 +1708,7 @@ failed: fbdev->fb_mem, fbdev->fb_phys); if (fbdev->fb_info.cmap.len != 0) fb_dealloc_cmap(&fbdev->fb_info.cmap); - if (fbdev->fb_info.pseudo_palette) - kfree(fbdev->fb_info.pseudo_palette); + kfree(fbdev->fb_info.pseudo_palette); if (plane == 0) free_irq(AU1200_LCD_INT, (void*)dev); return ret; @@ -1738,8 +1737,7 @@ static int au1200fb_drv_remove(struct platform_device *dev) fbdev->fb_mem, fbdev->fb_phys); if (fbdev->fb_info.cmap.len != 0) fb_dealloc_cmap(&fbdev->fb_info.cmap); - if (fbdev->fb_info.pseudo_palette) - kfree(fbdev->fb_info.pseudo_palette); + kfree(fbdev->fb_info.pseudo_palette); } free_irq(AU1200_LCD_INT, (void *)dev); diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c index 25f835b..46dd8f5 100644 --- a/drivers/video/console/softcursor.c +++ b/drivers/video/console/softcursor.c @@ -35,8 +35,7 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor) dsize = s_pitch * cursor->image.height; if (dsize + sizeof(struct fb_image) != ops->cursor_size) { - if (ops->cursor_src != NULL) - kfree(ops->cursor_src); + kfree(ops->cursor_src); ops->cursor_size = dsize + sizeof(struct fb_image); ops->cursor_src = kmalloc(ops->cursor_size, GFP_ATOMIC); diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c index e35232a..dd990cf 100644 --- a/drivers/video/uvesafb.c +++ b/drivers/video/uvesafb.c @@ -235,8 +235,7 @@ out: static void uvesafb_free(struct uvesafb_ktask *task) { if (task) { - if (task->done) - kfree(task->done); + kfree(task->done); kfree(task); } } @@ -1318,8 +1317,7 @@ setmode: FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR; info->fix.line_length = mode->bytes_per_scan_line; -out: if (crtc != NULL) - kfree(crtc); +out: kfree(crtc); uvesafb_free(task); return err; @@ -1415,8 +1413,7 @@ static void uvesafb_save_state(struct fb_info *info) { struct uvesafb_par *par = info->par; - if (par->vbe_state_saved) - kfree(par->vbe_state_saved); + kfree(par->vbe_state_saved); par->vbe_state_saved = uvesafb_vbe_state_save(par); } @@ -1824,8 +1821,7 @@ out_mode: fb_destroy_modedb(info->monspecs.modedb); fb_dealloc_cmap(&info->cmap); out: - if (par->vbe_modes) - kfree(par->vbe_modes); + kfree(par->vbe_modes); framebuffer_release(info); return err; @@ -1847,12 +1843,9 @@ static int uvesafb_remove(struct platform_device *dev) fb_dealloc_cmap(&info->cmap); if (par) { - if (par->vbe_modes) - kfree(par->vbe_modes); - if (par->vbe_state_orig) - kfree(par->vbe_state_orig); - if (par->vbe_state_saved) - kfree(par->vbe_state_saved); + kfree(par->vbe_modes); + kfree(par->vbe_state_orig); + kfree(par->vbe_state_saved); } framebuffer_release(info); diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 5c2caad..524f12c 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -597,8 +597,7 @@ new_bitmap: out: if (info) { - if (info->bitmap) - kfree(info->bitmap); + kfree(info->bitmap); kfree(info); } @@ -903,8 +902,7 @@ void btrfs_remove_free_space_cache(struct btrfs_block_group_cache *block_group) while ((node = rb_last(&block_group->free_space_offset)) != NULL) { info = rb_entry(node, struct btrfs_free_space, offset_index); unlink_free_space(block_group, info); - if (info->bitmap) - kfree(info->bitmap); + kfree(info->bitmap); kfree(info); if (need_resched()) { spin_unlock(&block_group->tree_lock); diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c index c1775b8..d2a897e 100644 --- a/fs/dlm/memory.c +++ b/fs/dlm/memory.c @@ -82,8 +82,7 @@ void dlm_free_lkb(struct dlm_lkb *lkb) struct dlm_user_args *ua; ua = lkb->lkb_ua; if (ua) { - if (ua->lksb.sb_lvbptr) - kfree(ua->lksb.sb_lvbptr); + kfree(ua->lksb.sb_lvbptr); kfree(ua); } } diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index a0a7847..e4e699c 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c @@ -1076,8 +1076,7 @@ decrypt_pki_encrypted_session_key(struct ecryptfs_auth_tok *auth_tok, crypt_stat->key_size); } out: - if (msg) - kfree(msg); + kfree(msg); return rc; } diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c index f1c17e8..cbaffe9 100644 --- a/fs/ecryptfs/messaging.c +++ b/fs/ecryptfs/messaging.c @@ -96,8 +96,7 @@ static void ecryptfs_msg_ctx_free_to_alloc(struct ecryptfs_msg_ctx *msg_ctx) void ecryptfs_msg_ctx_alloc_to_free(struct ecryptfs_msg_ctx *msg_ctx) { list_move(&(msg_ctx->node), &ecryptfs_msg_ctx_free_list); - if (msg_ctx->msg) - kfree(msg_ctx->msg); + kfree(msg_ctx->msg); msg_ctx->msg = NULL; msg_ctx->state = ECRYPTFS_MSG_CTX_STATE_FREE; } @@ -540,8 +539,7 @@ void ecryptfs_release_messaging(void) mutex_lock(&ecryptfs_msg_ctx_lists_mux); for (i = 0; i < ecryptfs_message_buf_len; i++) { mutex_lock(&ecryptfs_msg_ctx_arr[i].mux); - if (ecryptfs_msg_ctx_arr[i].msg) - kfree(ecryptfs_msg_ctx_arr[i].msg); + kfree(ecryptfs_msg_ctx_arr[i].msg); mutex_unlock(&ecryptfs_msg_ctx_arr[i].mux); } kfree(ecryptfs_msg_ctx_arr); diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c index 7edb62e..d897210 100644 --- a/fs/jffs2/acl.c +++ b/fs/jffs2/acl.c @@ -190,8 +190,7 @@ static struct posix_acl *jffs2_get_acl(struct inode *inode, int type) } else { acl = ERR_PTR(rc); } - if (value) - kfree(value); + kfree(value); if (!IS_ERR(acl)) set_cached_acl(inode, type, acl); return acl; diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c index 696686c..c5f2134 100644 --- a/fs/jffs2/scan.c +++ b/fs/jffs2/scan.c @@ -270,8 +270,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) else c->mtd->unpoint(c->mtd, 0, c->mtd->size); #endif - if (s) - kfree(s); + kfree(s); return ret; } diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c index 082e844..57464aa 100644 --- a/fs/jffs2/xattr.c +++ b/fs/jffs2/xattr.c @@ -744,8 +744,7 @@ void jffs2_clear_xattr_subsystem(struct jffs2_sb_info *c) for (i=0; i < XATTRINDEX_HASHSIZE; i++) { list_for_each_entry_safe(xd, _xd, &c->xattrindex[i], xindex) { list_del(&xd->xindex); - if (xd->xname) - kfree(xd->xname); + kfree(xd->xname); jffs2_free_xattr_datum(xd); } } diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index ed7c269..78ab731 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2137,8 +2137,7 @@ static int nfs4_get_referral(struct inode *dir, const struct qstr *name, struct out: if (page) __free_page(page); - if (locations) - kfree(locations); + kfree(locations); return status; } diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 38a42f5..337a680 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -7196,8 +7196,7 @@ int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle, mlog_errno(ret); out: - if (pages) - kfree(pages); + kfree(pages); return ret; } diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index c452d11..0b0994d 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c @@ -1057,8 +1057,7 @@ static void o2hb_region_release(struct config_item *item) struct page *page; struct o2hb_region *reg = to_o2hb_region(item); - if (reg->hr_tmp_block) - kfree(reg->hr_tmp_block); + kfree(reg->hr_tmp_block); if (reg->hr_slot_data) { for (i = 0; i < reg->hr_num_pages; i++) { @@ -1072,8 +1071,7 @@ static void o2hb_region_release(struct config_item *item) if (reg->hr_bdev) blkdev_put(reg->hr_bdev, FMODE_READ|FMODE_WRITE); - if (reg->hr_slots) - kfree(reg->hr_slots); + kfree(reg->hr_slots); spin_lock(&o2hb_live_lock); list_del(®->hr_all_item); diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index 334f231..c815e63 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -1080,10 +1080,8 @@ out: o2net_debug_del_nst(&nst); /* must be before dropping sc and node */ if (sc) sc_put(sc); - if (vec) - kfree(vec); - if (msg) - kfree(msg); + kfree(vec); + kfree(msg); o2net_complete_nsw(nn, &nsw, 0, 0, 0); return ret; } diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 0334000..c95173c 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c @@ -306,8 +306,7 @@ static void dlm_free_ctxt_mem(struct dlm_ctxt *dlm) if (dlm->master_hash) dlm_free_pagevec((void **)dlm->master_hash, DLM_HASH_PAGES); - if (dlm->name) - kfree(dlm->name); + kfree(dlm->name); kfree(dlm); } diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index d9fa3d2..45d97de 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c @@ -1468,10 +1468,8 @@ leave: dlm_put(dlm); if (ret < 0) { - if (buf) - kfree(buf); - if (item) - kfree(item); + kfree(buf); + kfree(item); } mlog_exit(ret); diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c index 843db64..2911dc7 100644 --- a/fs/ocfs2/extent_map.c +++ b/fs/ocfs2/extent_map.c @@ -280,8 +280,7 @@ search: spin_unlock(&oi->ip_lock); out: - if (new_emi) - kfree(new_emi); + kfree(new_emi); } static int ocfs2_last_eb_is_empty(struct inode *inode, diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 54c16b6..2e30499 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -1278,11 +1278,9 @@ static void ocfs2_queue_recovery_completion(struct ocfs2_journal *journal, /* Though we wish to avoid it, we are in fact safe in * skipping local alloc cleanup as fsck.ocfs2 is more * than capable of reclaiming unused space. */ - if (la_dinode) - kfree(la_dinode); + kfree(la_dinode); - if (tl_dinode) - kfree(tl_dinode); + kfree(tl_dinode); if (qrec) ocfs2_free_quota_recovery(qrec); @@ -1454,8 +1452,7 @@ bail: mutex_unlock(&osb->recovery_lock); - if (rm_quota) - kfree(rm_quota); + kfree(rm_quota); mlog_exit(status); /* no one is callint kthread_stop() for us so the kthread() api diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c index ac10f83..d7eefe1 100644 --- a/fs/ocfs2/localalloc.c +++ b/fs/ocfs2/localalloc.c @@ -337,8 +337,7 @@ out: if (local_alloc_inode) iput(local_alloc_inode); - if (alloc_copy) - kfree(alloc_copy); + kfree(alloc_copy); mlog_exit_void(); } @@ -1200,8 +1199,7 @@ bail: if (main_bm_inode) iput(main_bm_inode); - if (alloc_copy) - kfree(alloc_copy); + kfree(alloc_copy); if (ac) ocfs2_free_alloc_context(ac); diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index c0e48ae..a59705c 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -2384,8 +2384,7 @@ static int ocfs2_check_volume(struct ocfs2_super *osb) mlog_errno(status); finally: - if (local_alloc) - kfree(local_alloc); + kfree(local_alloc); mlog_exit(status); return status; @@ -2413,8 +2412,7 @@ static void ocfs2_delete_osb(struct ocfs2_super *osb) * we free it here. */ kfree(osb->journal); - if (osb->local_alloc_copy) - kfree(osb->local_alloc_copy); + kfree(osb->local_alloc_copy); kfree(osb->uuid_str); ocfs2_put_dlm_debug(osb->osb_dlm_debug); memset(osb, 0, sizeof(struct ocfs2_super)); diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h index 7f8fc5d..5a71841 100644 --- a/include/net/netfilter/nf_conntrack_extend.h +++ b/include/net/netfilter/nf_conntrack_extend.h @@ -53,8 +53,7 @@ static inline void nf_ct_ext_destroy(struct nf_conn *ct) */ static inline void nf_ct_ext_free(struct nf_conn *ct) { - if (ct->ext) - kfree(ct->ext); + kfree(ct->ext); } /* Add this type, returns pointer to data or NULL. */ diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index 10a6989..44fcc84 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c @@ -231,9 +231,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/scripts/dtc/data.c b/scripts/dtc/data.c index dd2e3d3..dd31177 100644 --- a/scripts/dtc/data.c +++ b/scripts/dtc/data.c @@ -32,8 +32,7 @@ void data_free(struct data d) m = nm; } - if (d.val) - free(d.val); + free(d.val); } struct data data_grow_for(struct data d, int xlen) diff --git a/scripts/genksyms/lex.c_shipped b/scripts/genksyms/lex.c_shipped index 2ac23bc..571cabd 100644 --- a/scripts/genksyms/lex.c_shipped +++ b/scripts/genksyms/lex.c_shipped @@ -2311,8 +2311,7 @@ repeat: /* Save the filename and line number for later error messages. */ - if (cur_filename) - free(cur_filename); + free(cur_filename); file = strchr(yytext, '\"')+1; e = strchr(file, '\"'); diff --git a/scripts/genksyms/lex.l b/scripts/genksyms/lex.l index fe50ff9..b120089 100644 --- a/scripts/genksyms/lex.l +++ b/scripts/genksyms/lex.l @@ -151,8 +151,7 @@ repeat: /* Save the filename and line number for later error messages. */ - if (cur_filename) - free(cur_filename); + free(cur_filename); file = strchr(yytext, '\"')+1; e = strchr(file, '\"'); diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index b55e72f..8714bac 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -206,8 +206,7 @@ load: case S_INT: case S_HEX: case S_STRING: - if (sym->def[def].val) - free(sym->def[def].val); + free(sym->def[def].val); default: sym->def[def].val = NULL; sym->def[def].tri = no; diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c index b6b2a46..87e2e96 100644 --- a/scripts/kconfig/util.c +++ b/scripts/kconfig/util.c @@ -94,8 +94,7 @@ struct gstr str_assign(const char *s) /* Free storage for growable string */ void str_free(struct gstr *gs) { - if (gs->s) - free(gs->s); + free(gs->s); gs->s = NULL; gs->len = 0; } diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c index 84bb07d..18b9eb9 100644 --- a/sound/aoa/codecs/onyx.c +++ b/sound/aoa/codecs/onyx.c @@ -1111,8 +1111,7 @@ static int onyx_i2c_remove(struct i2c_client *client) aoa_codec_unregister(&onyx->codec); of_node_put(onyx->codec.node); - if (onyx->codec_info) - kfree(onyx->codec_info); + kfree(onyx->codec_info); i2c_set_clientdata(client, onyx); kfree(onyx); return 0; diff --git a/sound/aoa/core/gpio-pmf.c b/sound/aoa/core/gpio-pmf.c index 1dd0c28..08f7de1 100644 --- a/sound/aoa/core/gpio-pmf.c +++ b/sound/aoa/core/gpio-pmf.c @@ -115,12 +115,9 @@ static void pmf_gpio_exit(struct gpio_runtime *rt) mutex_destroy(&rt->line_in_notify.mutex); mutex_destroy(&rt->line_out_notify.mutex); - if (rt->headphone_notify.gpio_private) - kfree(rt->headphone_notify.gpio_private); - if (rt->line_in_notify.gpio_private) - kfree(rt->line_in_notify.gpio_private); - if (rt->line_out_notify.gpio_private) - kfree(rt->line_out_notify.gpio_private); + kfree(rt->headphone_notify.gpio_private); + kfree(rt->line_in_notify.gpio_private); + kfree(rt->line_out_notify.gpio_private); } static void pmf_handle_notify_irq(void *data) diff --git a/sound/core/control.c b/sound/core/control.c index a8b7fab..40b07c5 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -942,8 +942,7 @@ static int snd_ctl_elem_user_tlv(struct snd_kcontrol *kcontrol, static void snd_ctl_elem_user_free(struct snd_kcontrol *kcontrol) { struct user_element *ue = kcontrol->private_data; - if (ue->tlv_data) - kfree(ue->tlv_data); + kfree(ue->tlv_data); kfree(ue); } diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c index af56eb9..0bc1c8e 100644 --- a/sound/pci/ctxfi/ctdaio.c +++ b/sound/pci/ctxfi/ctdaio.c @@ -583,10 +583,8 @@ static int get_daio_rsc(struct daio_mgr *mgr, return 0; error: - if (dao) - kfree(dao); - else if (dai) - kfree(dai); + kfree(dao); + kfree(dai); spin_lock_irqsave(&mgr->mgr_lock, flags); daio_mgr_put_rsc(&mgr->mgr, desc->type); diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index 4b302d8..7b7e57b 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c @@ -768,8 +768,7 @@ static void snd_emu10k1_ctl_private_free(struct snd_kcontrol *kctl) kctl->private_value = 0; list_del(&ctl->list); kfree(ctl); - if (kctl->tlv.p) - kfree(kctl->tlv.p); + kfree(kctl->tlv.p); } static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu, diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index af989f6..70ba9f1 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -488,8 +488,7 @@ static int snd_hda_bus_free(struct hda_bus *bus) return 0; if (bus->workq) flush_workqueue(bus->workq); - if (bus->unsol) - kfree(bus->unsol); + kfree(bus->unsol); list_for_each_entry_safe(codec, n, &bus->codec_list, list) { snd_hda_codec_free(codec); } diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index d11a6d7..fc89370 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -538,8 +538,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, int ttsa = ssp_read_reg(ssp, SSTSA) & 0xf; /* generate correct DMA params */ - if (cpu_dai->dma_data) - kfree(cpu_dai->dma_data); + kfree(cpu_dai->dma_data); /* Network mode with one active slot (ttsa == 1) can be used * to force 16-bit frame width on the wire (for S16_LE), even diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index ce2d5be..48f72b1 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -441,8 +441,7 @@ static u64 get_cpu_usage_nsec_self(void) break; } } - if (line) - free(line); + free(line); fclose(file); return total; diff --git a/tools/perf/util/module.c b/tools/perf/util/module.c index 0d8c85d..d18e769 100644 --- a/tools/perf/util/module.c +++ b/tools/perf/util/module.c @@ -155,10 +155,8 @@ static struct section *section__new(const char *name, const char *path) out_failure: if (self) { - if (self->name) - free(self->name); - if (self->path) - free(self->path); + free(self->name); + free(self->path); free(self); } @@ -299,10 +297,8 @@ static struct module *module__new(const char *name, const char *path) out_failure: if (self) { - if (self->name) - free(self->name); - if (self->path) - free(self->path); + free(self->name); + free(self->path); free(self); } @@ -525,12 +521,10 @@ static int mod_dso__load_module_paths(struct mod_dso *self) fprintf(stderr, "load_module_paths: modules.dep parsing failure!\n"); out_failure: - if (dpath) - free(dpath); + free(dpath); if (file) fclose(file); - if (line) - free(line); + free(line); return err; } diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index 45efb5d..595fdc1 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c @@ -23,8 +23,7 @@ static struct thread *thread__new(pid_t pid) int thread__set_comm(struct thread *self, const char *comm) { - if (self->comm) - free(self->comm); + free(self->comm); self->comm = strdup(comm); return self->comm ? 0 : -ENOMEM; } @@ -130,8 +129,7 @@ int thread__fork(struct thread *self, struct thread *parent) { struct map *map; - if (self->comm) - free(self->comm); + free(self->comm); self->comm = strdup(parent->comm); if (!self->comm) return -ENOMEM; diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 55c9659..cb7ce09 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -376,8 +376,7 @@ static void free_arg(struct print_arg *arg) switch (arg->type) { case PRINT_ATOM: - if (arg->atom.atom) - free(arg->atom.atom); + free(arg->atom.atom); break; case PRINT_NULL: case PRINT_FIELD ... PRINT_OP: @@ -570,8 +569,7 @@ static enum event_type __read_token(char **tok) static void free_token(char *tok) { - if (tok) - free(tok); + free(tok); } static enum event_type read_token(char **tok) @@ -911,8 +909,7 @@ static int event_read_fields(struct event *event, struct format_field **fields) fail: free_token(token); fail_expect: - if (field) - free(field); + free(field); return -1; } diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c index 83b3dde..97fc90b 100644 --- a/usr/gen_init_cpio.c +++ b/usr/gen_init_cpio.c @@ -365,7 +365,7 @@ static int cpio_mkfile(const char *name, const char *location, rc = 0; error: - if (filebuf) free(filebuf); + free(filebuf); if (file >= 0) close(file); return rc; } -- 1.6.5.1.349.gd3b1e