PCI: Remove CONFIG_HOTPLUG ifdefs
Remove conditional code based on CONFIG_HOTPLUG being false. It's always on now in preparation of it going away as an option. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
8c610c120f
commit
b40b97ae73
@@ -89,10 +89,6 @@ static void pci_free_dynids(struct pci_driver *drv)
|
||||
spin_unlock(&drv->dynids.lock);
|
||||
}
|
||||
|
||||
/*
|
||||
* Dynamic device ID manipulation via sysfs is disabled for !CONFIG_HOTPLUG
|
||||
*/
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
/**
|
||||
* store_new_id - sysfs frontend to pci_add_dynid()
|
||||
* @driver: target device driver
|
||||
@@ -191,10 +187,6 @@ static struct driver_attribute pci_drv_attrs[] = {
|
||||
__ATTR_NULL,
|
||||
};
|
||||
|
||||
#else
|
||||
#define pci_drv_attrs NULL
|
||||
#endif /* CONFIG_HOTPLUG */
|
||||
|
||||
/**
|
||||
* pci_match_id - See if a pci device matches a given pci_id table
|
||||
* @ids: array of PCI device id structures to search in
|
||||
@@ -1223,13 +1215,6 @@ void pci_dev_put(struct pci_dev *dev)
|
||||
put_device(&dev->dev);
|
||||
}
|
||||
|
||||
#ifndef CONFIG_HOTPLUG
|
||||
int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
|
||||
{
|
||||
return -ENODEV;
|
||||
}
|
||||
#endif
|
||||
|
||||
struct bus_type pci_bus_type = {
|
||||
.name = "pci",
|
||||
.match = pci_bus_match,
|
||||
|
Reference in New Issue
Block a user