Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2132fec authored by Alex Chiang's avatar Alex Chiang Committed by Jesse Barnes
Browse files

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: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent e1acb24f

drivers/pci/hotplug/rpaphp_slot.c

+3 −5
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot) 
void dealloc_slot_struct(struct slot *slot)

{

	kfree(slot->hotplug_slot->info);

	kfree(slot->hotplug_slot->name);

	kfree(slot->name);

	kfree(slot->hotplug_slot);

	kfree(slot);

}
@@ -63,11 +63,9 @@ struct slot *alloc_slot_struct(struct device_node *dn, 
					   GFP_KERNEL);

	if (!slot->hotplug_slot->info)

		goto error_hpslot;

	slot->hotplug_slot->name = kmalloc(strlen(drc_name) + 1, GFP_KERNEL);

	if (!slot->hotplug_slot->name)

	slot->name = kstrdup(drc_name, GFP_KERNEL);

	if (!slot->name)

		goto error_info;	

	slot->name = slot->hotplug_slot->name;

	strcpy(slot->name, drc_name);

	slot->dn = dn;

	slot->index = drc_index;

	slot->power_domain = power_domain;