diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-17 10:31:34 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-17 10:31:34 -0600 |
| commit | 723ec4d06cb2eed481436cfe008f5f63c45e88fd (patch) | |
| tree | e59112af8616e8fbc0cc6c2219b49fd2f05bfc41 /drivers/pci/setup-res.c | |
| parent | a3b6bbd5774c13dab89d72f79976ba762913b2f2 (diff) | |
| parent | f39d5b72913e2a9ff00ba5ab145ee05a888b1286 (diff) | |
| download | linux-3.10-723ec4d06cb2eed481436cfe008f5f63c45e88fd.tar.gz linux-3.10-723ec4d06cb2eed481436cfe008f5f63c45e88fd.tar.bz2 linux-3.10-723ec4d06cb2eed481436cfe008f5f63c45e88fd.zip | |
Merge branch 'pci/cleanup' into next
* pci/cleanup:
PCI: Remove "extern" from function declarations
PCI: Warn about failures instead of "must_check" functions
PCI: Remove __must_check from definitions
PCI: Remove unused variables
PCI: Move cpci_hotplug_init() proto to header file
PCI: Make local functions/structs static
PCI: Fix missing prototype for pcie_port_acpi_setup()
Conflicts:
drivers/pci/hotplug/acpiphp.h
include/linux/pci.h
Diffstat (limited to 'drivers/pci/setup-res.c')
| -rw-r--r-- | drivers/pci/setup-res.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 81b88bda793..07f2eddc09c 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -261,7 +261,6 @@ int pci_assign_resource(struct pci_dev *dev, int resno) { struct resource *res = dev->resource + resno; resource_size_t align, size; - struct pci_bus *bus; int ret; align = pci_resource_alignment(dev, res); @@ -271,7 +270,6 @@ int pci_assign_resource(struct pci_dev *dev, int resno) return -EINVAL; } - bus = dev->bus; size = resource_size(res); ret = _pci_assign_resource(dev, resno, size, align); |