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

Commit 4ab44676 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Bjorn Helgaas
Browse files

PCI: Remove unused pci_renumber_slot() 

My philosophy is unused code is dead code.  And dead code is subject to bit
rot and is a likely source of bugs.  Use it or lose it.

This reverts part of f46753c5 ("PCI: introduce pci_slot") and
d25b7c8d ("PCI: rename pci_update_slot_number to pci_renumber_slot"),
removing this interface:

    pci_renumber_slot()

[bhelgaas: split to separate patch, add historical link from Alex]
Link: http://lkml.kernel.org/r/20081009043140.8678.44164.stgit@bob.kio


Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarAlex Chiang <achiang@canonical.com>
parent 8f92fb06

drivers/pci/slot.c

+0 −26
Original line number Diff line number Diff line
@@ -319,32 +319,6 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr, 
}

EXPORT_SYMBOL_GPL(pci_create_slot);



/**

 * pci_renumber_slot - update %struct pci_slot -> number

 * @slot: &struct pci_slot to update

 * @slot_nr: new number for slot

 *

 * The primary purpose of this interface is to allow callers who earlier

 * created a placeholder slot in pci_create_slot() by passing a -1 as

 * slot_nr, to update their %struct pci_slot with the correct @slot_nr.

 */

void pci_renumber_slot(struct pci_slot *slot, int slot_nr)

{

	struct pci_slot *tmp;



	down_write(&pci_bus_sem);



	list_for_each_entry(tmp, &slot->bus->slots, list) {

		WARN_ON(tmp->number == slot_nr);

		goto out;

	}



	slot->number = slot_nr;

out:

	up_write(&pci_bus_sem);

}

EXPORT_SYMBOL_GPL(pci_renumber_slot);



/**

 * pci_destroy_slot - decrement refcount for physical PCI slot

 * @slot: struct pci_slot to decrement

include/linux/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -763,7 +763,6 @@ struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr, 
				 const char *name,

				 struct hotplug_slot *hotplug);

void pci_destroy_slot(struct pci_slot *slot);

void pci_renumber_slot(struct pci_slot *slot, int slot_nr);

int pci_scan_slot(struct pci_bus *bus, int devfn);

struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn);

void pci_device_add(struct pci_dev *dev, struct pci_bus *bus);