PCI: rpaphp: kmalloc/kfree slot->name directly
rpaphp tends to use slot->name directly everywhere, and doesn't ever need slot->hotplug_slot->name. struct hotplug_slot->name is going away, so convert rpaphp directly manipulate its own slot->name everywhere, and don't bother touching slot->hotplug_slot->name. Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Alex Chiang <achiang@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
parent
e1acb24f05
commit
b2132fecca
|
@ -43,7 +43,7 @@ static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)
|
||||||
void dealloc_slot_struct(struct slot *slot)
|
void dealloc_slot_struct(struct slot *slot)
|
||||||
{
|
{
|
||||||
kfree(slot->hotplug_slot->info);
|
kfree(slot->hotplug_slot->info);
|
||||||
kfree(slot->hotplug_slot->name);
|
kfree(slot->name);
|
||||||
kfree(slot->hotplug_slot);
|
kfree(slot->hotplug_slot);
|
||||||
kfree(slot);
|
kfree(slot);
|
||||||
}
|
}
|
||||||
|
@ -63,11 +63,9 @@ struct slot *alloc_slot_struct(struct device_node *dn,
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (!slot->hotplug_slot->info)
|
if (!slot->hotplug_slot->info)
|
||||||
goto error_hpslot;
|
goto error_hpslot;
|
||||||
slot->hotplug_slot->name = kmalloc(strlen(drc_name) + 1, GFP_KERNEL);
|
slot->name = kstrdup(drc_name, GFP_KERNEL);
|
||||||
if (!slot->hotplug_slot->name)
|
if (!slot->name)
|
||||||
goto error_info;
|
goto error_info;
|
||||||
slot->name = slot->hotplug_slot->name;
|
|
||||||
strcpy(slot->name, drc_name);
|
|
||||||
slot->dn = dn;
|
slot->dn = dn;
|
||||||
slot->index = drc_index;
|
slot->index = drc_index;
|
||||||
slot->power_domain = power_domain;
|
slot->power_domain = power_domain;
|
||||||
|
|
Loading…
Reference in New Issue