Browse Source

PCI/portdrv: Remove extra get_device()/put_device() for pcie_device

Previously pcie_device_init() called get_device() if device_register() for
the new pcie_device succeeded, and remove_iter() called put_device() when
removing before unregistering the device.

But device_register() already increments the reference count in
device_add(), so we don't need to do it again here.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Bjorn Helgaas 11 years ago
parent
commit
e75f34ce66
1 changed files with 1 additions and 4 deletions
  1. 1 4
      drivers/pci/pcie/portdrv_core.c

+ 1 - 4
drivers/pci/pcie/portdrv_core.c

@@ -349,7 +349,6 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq)
 		return retval;
 		return retval;
 	}
 	}
 
 
-	get_device(device);
 	return 0;
 	return 0;
 }
 }
 
 
@@ -456,10 +455,8 @@ int pcie_port_device_resume(struct device *dev)
 
 
 static int remove_iter(struct device *dev, void *data)
 static int remove_iter(struct device *dev, void *data)
 {
 {
-	if (dev->bus == &pcie_port_bus_type) {
-		put_device(dev);
+	if (dev->bus == &pcie_port_bus_type)
 		device_unregister(dev);
 		device_unregister(dev);
-	}
 	return 0;
 	return 0;
 }
 }