Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / drivers / pci / remove.c

diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 86503c14ce7e610119ae8b8f0a1e3f5148a1d0b5..7f87beed35ac1c9eddec522b4efa6400cc6598da 100644 (file)
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -32,8 +32,6 @@ static void pci_stop_dev(struct pci_dev *dev)
 
 static void pci_destroy_dev(struct pci_dev *dev)
 {
-       pci_stop_dev(dev);
-
        /* Remove the device from the device lists, and prevent any further
         * list accesses from this device */
        down_write(&pci_bus_sem);
@@ -75,8 +73,6 @@ void pci_remove_bus(struct pci_bus *pci_bus)
                return;
 
        pci_remove_legacy_files(pci_bus);
-       device_remove_file(&pci_bus->dev, &dev_attr_cpuaffinity);
-       device_remove_file(&pci_bus->dev, &dev_attr_cpulistaffinity);
        device_unregister(&pci_bus->dev);
 }
 EXPORT_SYMBOL(pci_remove_bus);