adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-30 12:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] libata-core cleanups (updated)

Browse source 
libata-core cleanups:
- use kzalloc() instead of kmalloc() + memset();
- use one exit path in ata_device_add();

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Randy Dunlap 2005-10-28 20:37:23 -07:00 committed by Jeff Garzik
parent ac19bff25b
commit 57f3bda88a
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/scsi/libata-core.c
View file

@ -4258,11 +4258,10 @@ int ata_device_add(const struct ata_probe_ent *ent)
DPRINTK("ENTER\n"); DPRINTK("ENTER\n");
/* alloc a container for our list of ATA ports (buses) */ /* alloc a container for our list of ATA ports (buses) */
host_set = kmalloc(sizeof(struct ata_host_set) + host_set = kzalloc(sizeof(struct ata_host_set) +
(ent->n_ports * sizeof(void *)), GFP_KERNEL); (ent->n_ports * sizeof(void *)), GFP_KERNEL);
if (!host_set) if (!host_set)
return 0; return 0;
memset(host_set, 0, sizeof(struct ata_host_set) + (ent->n_ports * sizeof(void *)));
spin_lock_init(&host_set->lock); spin_lock_init(&host_set->lock);
host_set->dev = dev; host_set->dev = dev;
@ -4302,10 +4301,8 @@ int ata_device_add(const struct ata_probe_ent *ent)
count++; count++;
} }
if (!count) { if (!count)
kfree(host_set); goto err_free_ret;
return 0;
}
/* obtain irq, that is shared between channels */ /* obtain irq, that is shared between channels */
if (request_irq(ent->irq, ent->port_ops->irq_handler, ent->irq_flags, if (request_irq(ent->irq, ent->port_ops->irq_handler, ent->irq_flags,
@ -4363,6 +4360,7 @@ err_out:
ata_host_remove(host_set->ports[i], 1); ata_host_remove(host_set->ports[i], 1);
scsi_host_put(host_set->ports[i]->host); scsi_host_put(host_set->ports[i]->host);
} }
err_free_ret:
kfree(host_set); kfree(host_set);
VPRINTK("EXIT, returning 0\n"); VPRINTK("EXIT, returning 0\n");
return 0; return 0;
@ -4472,15 +4470,13 @@ ata_probe_ent_alloc(struct device *dev, const struct ata_port_info *port)
{ {
struct ata_probe_ent *probe_ent; struct ata_probe_ent *probe_ent;
probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL); probe_ent = kzalloc(sizeof(*probe_ent), GFP_KERNEL);
if (!probe_ent) { if (!probe_ent) {
printk(KERN_ERR DRV_NAME "(%s): out of memory\n", printk(KERN_ERR DRV_NAME "(%s): out of memory\n",
kobject_name(&(dev->kobj))); kobject_name(&(dev->kobj)));
return NULL; return NULL;
} }
memset(probe_ent, 0, sizeof(*probe_ent));
INIT_LIST_HEAD(&probe_ent->node); INIT_LIST_HEAD(&probe_ent->node);
probe_ent->dev = dev; probe_ent->dev = dev;