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

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

PCI: SGI Hotplug: stop managing bss_hotplug_slot->name 



We no longer need to manage our version of hotplug_slot->name
since the PCI and hotplug core manage it on our behalf.

Update the sn_hp_slot_private_alloc() interface to fill in
the correct name for us, as that function already has all
the parameters needed to determine the name.

Cc: kristen.c.accardi@intel.com
Cc: jpk@sgi.com
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 b2132fec

drivers/pci/hotplug/sgi_hotplug.c

+6 −13
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ static int sn_pci_bus_valid(struct pci_bus *pci_bus) 
}



static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot,

				    struct pci_bus *pci_bus, int device)

				    struct pci_bus *pci_bus, int device,

				    char *name)

{

	struct pcibus_info *pcibus_info;

	struct slot *slot;
@@ -173,15 +174,9 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot, 
		return -ENOMEM;

	bss_hotplug_slot->private = slot;



	bss_hotplug_slot->name = kmalloc(SN_SLOT_NAME_SIZE, GFP_KERNEL);

	if (!bss_hotplug_slot->name) {

		kfree(bss_hotplug_slot->private);

		return -ENOMEM;

	}



	slot->device_num = device;

	slot->pci_bus = pci_bus;

	sprintf(bss_hotplug_slot->name, "%04x:%02x:%02x",

	sprintf(name, "%04x:%02x:%02x",

		pci_domain_nr(pci_bus),

		((u16)pcibus_info->pbi_buscommon.bs_persist_busnum),

		device + 1);
@@ -608,7 +603,6 @@ static inline int get_power_status(struct hotplug_slot *bss_hotplug_slot, 
static void sn_release_slot(struct hotplug_slot *bss_hotplug_slot)

{

	kfree(bss_hotplug_slot->info);

	kfree(bss_hotplug_slot->name);

	kfree(bss_hotplug_slot->private);

	kfree(bss_hotplug_slot);

}
@@ -618,6 +612,7 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus) 
	int device;

	struct pci_slot *pci_slot;

	struct hotplug_slot *bss_hotplug_slot;

	char name[SN_SLOT_NAME_SIZE];

	int rc = 0;



	/*
@@ -645,16 +640,14 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus) 
		}



		if (sn_hp_slot_private_alloc(bss_hotplug_slot,

					     pci_bus, device)) {

					     pci_bus, device, name)) {

			rc = -ENOMEM;

			goto alloc_err;

		}



		bss_hotplug_slot->ops = &sn_hotplug_slot_ops;

		bss_hotplug_slot->release = &sn_release_slot;



		rc = pci_hp_register(bss_hotplug_slot, pci_bus, device,

				     bss_hotplug_slot->name);

		rc = pci_hp_register(bss_hotplug_slot, pci_bus, device, name);

		if (rc)

			goto register_err;