From: Jesper Juhl Remove redundant NULL chck before kfree + tiny CodingStyle cleanup for drivers/ Signed-off-by: Jesper Juhl Signed-off-by: Andrew Morton --- drivers/char/agp/sgi-agp.c | 5 ++--- drivers/char/hvcs.c | 11 +++++------ drivers/message/fusion/mptfc.c | 6 ++---- drivers/message/fusion/mptsas.c | 3 +-- drivers/net/fs_enet/fs_enet-mii.c | 3 +-- drivers/net/wireless/ipw2200.c | 22 ++++++---------------- drivers/scsi/libata-scsi.c | 4 +--- drivers/video/au1100fb.c | 3 +-- 8 files changed, 19 insertions(+), 38 deletions(-) diff -puN drivers/char/agp/sgi-agp.c~remove-redundant-null-checks-before-free-in-drivers drivers/char/agp/sgi-agp.c --- devel/drivers/char/agp/sgi-agp.c~remove-redundant-null-checks-before-free-in-drivers 2006-05-17 13:10:25.000000000 -0700 +++ devel-akpm/drivers/char/agp/sgi-agp.c 2006-05-17 13:10:25.000000000 -0700 @@ -329,9 +329,8 @@ static int __devinit agp_sgi_init(void) static void __devexit agp_sgi_cleanup(void) { - if (sgi_tioca_agp_bridges) - kfree(sgi_tioca_agp_bridges); - sgi_tioca_agp_bridges=NULL; + kfree(sgi_tioca_agp_bridges); + sgi_tioca_agp_bridges = NULL; } module_init(agp_sgi_init); diff -puN drivers/char/hvcs.c~remove-redundant-null-checks-before-free-in-drivers drivers/char/hvcs.c --- devel/drivers/char/hvcs.c~remove-redundant-null-checks-before-free-in-drivers 2006-05-17 13:10:25.000000000 -0700 +++ devel-akpm/drivers/char/hvcs.c 2006-05-17 13:10:25.000000000 -0700 @@ -1320,11 +1320,12 @@ static struct tty_operations hvcs_ops = static int hvcs_alloc_index_list(int n) { int i; + hvcs_index_list = kmalloc(n * sizeof(hvcs_index_count),GFP_KERNEL); if (!hvcs_index_list) return -ENOMEM; hvcs_index_count = n; - for(i = 0; i < hvcs_index_count; i++) + for (i = 0; i < hvcs_index_count; i++) hvcs_index_list[i] = -1; return 0; } @@ -1332,11 +1333,9 @@ static int hvcs_alloc_index_list(int n) static void hvcs_free_index_list(void) { /* Paranoia check to be thorough. */ - if (hvcs_index_list) { - kfree(hvcs_index_list); - hvcs_index_list = NULL; - hvcs_index_count = 0; - } + kfree(hvcs_index_list); + hvcs_index_list = NULL; + hvcs_index_count = 0; } static int __init hvcs_module_init(void) diff -puN drivers/message/fusion/mptfc.c~remove-redundant-null-checks-before-free-in-drivers drivers/message/fusion/mptfc.c --- devel/drivers/message/fusion/mptfc.c~remove-redundant-null-checks-before-free-in-drivers 2006-05-17 13:10:25.000000000 -0700 +++ devel-akpm/drivers/message/fusion/mptfc.c 2006-05-17 13:10:25.000000000 -0700 @@ -312,10 +312,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, in } out: - if (pp0_array) - kfree(pp0_array); - if (p0_array) - kfree(p0_array); + kfree(pp0_array); + kfree(p0_array); return rc; } diff -puN drivers/message/fusion/mptsas.c~remove-redundant-null-checks-before-free-in-drivers drivers/message/fusion/mptsas.c --- devel/drivers/message/fusion/mptsas.c~remove-redundant-null-checks-before-free-in-drivers 2006-05-17 13:10:25.000000000 -0700 +++ devel-akpm/drivers/message/fusion/mptsas.c 2006-05-17 13:10:25.000000000 -0700 @@ -1378,8 +1378,7 @@ mptsas_probe_hba_phys(MPT_ADAPTER *ioc) return 0; out_free_port_info: - if (hba) - kfree(hba); + kfree(hba); out: return error; } diff -puN drivers/net/fs_enet/fs_enet-mii.c~remove-redundant-null-checks-before-free-in-drivers drivers/net/fs_enet/fs_enet-mii.c --- devel/drivers/net/fs_enet/fs_enet-mii.c~remove-redundant-null-checks-before-free-in-drivers 2006-05-17 13:10:25.000000000 -0700 +++ devel-akpm/drivers/net/fs_enet/fs_enet-mii.c 2006-05-17 13:10:25.000000000 -0700 @@ -431,8 +431,7 @@ static struct fs_enet_mii_bus *create_bu return bus; err: - if (bus) - kfree(bus); + kfree(bus); return ERR_PTR(ret); } diff -puN drivers/net/wireless/ipw2200.c~remove-redundant-null-checks-before-free-in-drivers drivers/net/wireless/ipw2200.c --- devel/drivers/net/wireless/ipw2200.c~remove-redundant-null-checks-before-free-in-drivers 2006-05-17 13:10:25.000000000 -0700 +++ devel-akpm/drivers/net/wireless/ipw2200.c 2006-05-17 13:10:25.000000000 -0700 @@ -1211,12 +1211,6 @@ static struct ipw_fw_error *ipw_alloc_er return error; } -static void ipw_free_error_log(struct ipw_fw_error *error) -{ - if (error) - kfree(error); -} - static ssize_t show_event_log(struct device *d, struct device_attribute *attr, char *buf) { @@ -1278,10 +1272,9 @@ static ssize_t clear_error(struct device const char *buf, size_t count) { struct ipw_priv *priv = dev_get_drvdata(d); - if (priv->error) { - ipw_free_error_log(priv->error); - priv->error = NULL; - } + + kfree(priv->error); + priv->error = NULL; return count; } @@ -1948,8 +1941,7 @@ static void ipw_irq_tasklet(struct ipw_p struct ipw_fw_error *error = ipw_alloc_error_log(priv); ipw_dump_error_log(priv, error); - if (error) - ipw_free_error_log(error); + kfree(error); } #endif } else { @@ -11670,10 +11662,8 @@ static void ipw_pci_remove(struct pci_de } } - if (priv->error) { - ipw_free_error_log(priv->error); - priv->error = NULL; - } + kfree(priv->error); + priv->error = NULL; #ifdef CONFIG_IPW2200_PROMISCUOUS ipw_prom_free(priv); diff -puN drivers/scsi/libata-scsi.c~remove-redundant-null-checks-before-free-in-drivers drivers/scsi/libata-scsi.c --- devel/drivers/scsi/libata-scsi.c~remove-redundant-null-checks-before-free-in-drivers 2006-05-17 13:10:25.000000000 -0700 +++ devel-akpm/drivers/scsi/libata-scsi.c 2006-05-17 13:10:25.000000000 -0700 @@ -215,9 +215,7 @@ int ata_cmd_ioctl(struct scsi_device *sc && copy_to_user(arg + sizeof(args), argbuf, argsize)) rc = -EFAULT; error: - if (argbuf) - kfree(argbuf); - + kfree(argbuf); return rc; } diff -puN drivers/video/au1100fb.c~remove-redundant-null-checks-before-free-in-drivers drivers/video/au1100fb.c --- devel/drivers/video/au1100fb.c~remove-redundant-null-checks-before-free-in-drivers 2006-05-17 13:10:25.000000000 -0700 +++ devel-akpm/drivers/video/au1100fb.c 2006-05-17 13:10:25.000000000 -0700 @@ -699,8 +699,7 @@ void __exit au1100fb_cleanup(void) { driver_unregister(&au1100fb_driver); - if (drv_info.opt_mode) - kfree(drv_info.opt_mode); + kfree(drv_info.opt_mode); } module_init(au1100fb_init); _