Commit 8f760780 authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds

[PATCH] Remove redundant NULL checks before [kv]free - in drivers/

Remove redundant NULL chck before kfree + tiny CodingStyle cleanup for
drivers/
Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9a66a53f
......@@ -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;
sgi_tioca_agp_bridges = NULL;
}
module_init(agp_sgi_init);
......
......@@ -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;
}
}
static int __init hvcs_module_init(void)
......
......@@ -305,9 +305,7 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,
}
out:
if (pp0_array)
kfree(pp0_array);
if (p0_array)
kfree(p0_array);
return rc;
}
......
......@@ -1378,7 +1378,6 @@ mptsas_probe_hba_phys(MPT_ADAPTER *ioc)
return 0;
out_free_port_info:
if (hba)
kfree(hba);
out:
return error;
......
......@@ -431,7 +431,6 @@ static struct fs_enet_mii_bus *create_bus(const struct fs_mii_bus_info *bi)
return bus;
err:
if (bus)
kfree(bus);
return ERR_PTR(ret);
}
......
......@@ -1229,12 +1229,6 @@ static struct ipw_fw_error *ipw_alloc_error_log(struct ipw_priv *priv)
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)
{
......@@ -1296,10 +1290,9 @@ static ssize_t clear_error(struct device *d,
const char *buf, size_t count)
{
struct ipw_priv *priv = dev_get_drvdata(d);
if (priv->error) {
ipw_free_error_log(priv->error);
kfree(priv->error);
priv->error = NULL;
}
return count;
}
......@@ -1970,8 +1963,7 @@ static void ipw_irq_tasklet(struct ipw_priv *priv)
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 {
......@@ -11693,10 +11685,8 @@ static void ipw_pci_remove(struct pci_dev *pdev)
}
}
if (priv->error) {
ipw_free_error_log(priv->error);
kfree(priv->error);
priv->error = NULL;
}
#ifdef CONFIG_IPW2200_PROMISCUOUS
ipw_prom_free(priv);
......
......@@ -222,9 +222,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
&& copy_to_user(arg + sizeof(args), argbuf, argsize))
rc = -EFAULT;
error:
if (argbuf)
kfree(argbuf);
return rc;
}
......
......@@ -743,7 +743,6 @@ void __exit au1100fb_cleanup(void)
{
driver_unregister(&au1100fb_driver);
if (drv_info.opt_mode)
kfree(drv_info.opt_mode);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment