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

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

PCI: fakephp: remove 'name' parameter 



Remove 'name' from fakephp's struct dummy_slot, as the PCI core
will now manage our slot name for us.

Cc: jbarnes@virtuousgeek.org
Cc: kristen.c.accardi@intel.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 0ad772ec

drivers/pci/hotplug/fakephp.c

+10 −9
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ struct dummy_slot { 
	struct pci_dev *dev;

	struct work_struct remove_work;

	unsigned long removed;

	char name[8];

};



static int debug;
@@ -96,10 +95,13 @@ static void dummy_release(struct hotplug_slot *slot) 
	kfree(dslot);

}



#define SLOT_NAME_SIZE	8



static int add_slot(struct pci_dev *dev)

{

	struct dummy_slot *dslot;

	struct hotplug_slot *slot;

	char name[SLOT_NAME_SIZE];

	int retval = -ENOMEM;

	static int count = 1;
@@ -119,20 +121,18 @@ static int add_slot(struct pci_dev *dev) 
	if (!dslot)

		goto error_info;



	slot->name = dslot->name;

	snprintf(slot->name, sizeof(dslot->name), "fake%d", count++);

	dbg("slot->name = %s\n", slot->name);

	snprintf(name, SLOT_NAME_SIZE, "fake%d", count++);

	slot->ops = &dummy_hotplug_slot_ops;

	slot->release = &dummy_release;

	slot->private = dslot;



	retval = pci_hp_register(slot, dev->bus, PCI_SLOT(dev->devfn),

				 slot->name);

	retval = pci_hp_register(slot, dev->bus, PCI_SLOT(dev->devfn), name);

	if (retval) {

		err("pci_hp_register failed with error %d\n", retval);

		goto error_dslot;

	}



	dbg("slot->name = %s\n", hotplug_slot_name(slot));

	dslot->slot = slot;

	dslot->dev = pci_dev_get(dev);

	list_add (&dslot->node, &slot_list);
@@ -168,10 +168,11 @@ static void remove_slot(struct dummy_slot *dslot) 
{

	int retval;



	dbg("removing slot %s\n", dslot->slot->name);

	dbg("removing slot %s\n", hotplug_slot_name(dslot->slot));

	retval = pci_hp_deregister(dslot->slot);

	if (retval)

		err("Problem unregistering a slot %s\n", dslot->slot->name);

		err("Problem unregistering a slot %s\n",

			hotplug_slot_name(dslot->slot));

}



/* called from the single-threaded workqueue handler to remove a slot */
@@ -309,7 +310,7 @@ static int disable_slot(struct hotplug_slot *slot) 
		return -ENODEV;

	dslot = slot->private;



	dbg("%s - physical_slot = %s\n", __func__, slot->name);

	dbg("%s - physical_slot = %s\n", __func__, hotplug_slot_name(slot));



	for (func = 7; func >= 0; func--) {

		dev = pci_get_slot(dslot->dev->bus, dslot->dev->devfn + func);