Skip to content

Commit

Permalink
PCI: remove pci_assign_resource_fixed()
Browse files Browse the repository at this point in the history
Adrian commented out this function in 2baad5f, but I don't think
it's even worth cluttering the file with the unused code.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  • Loading branch information
Bjorn Helgaas authored and Jesse Barnes committed Oct 6, 2009
1 parent e3fb20f commit b812cca
Showing 1 changed file with 0 additions and 37 deletions.
37 changes: 0 additions & 37 deletions drivers/pci/setup-res.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,43 +205,6 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
return ret;
}

#if 0
int pci_assign_resource_fixed(struct pci_dev *dev, int resno)
{
struct pci_bus *bus = dev->bus;
struct resource *res = dev->resource + resno;
unsigned int type_mask;
int i, ret = -EBUSY;

type_mask = IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH;

for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
struct resource *r = bus->resource[i];
if (!r)
continue;

/* type_mask must match */
if ((res->flags ^ r->flags) & type_mask)
continue;

ret = request_resource(r, res);

if (ret == 0)
break;
}

if (ret) {
dev_err(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",
resno, res->flags & IORESOURCE_IO ? "I/O" : "mem", res);
} else if (resno < PCI_BRIDGE_RESOURCES) {
pci_update_resource(dev, resno);
}

return ret;
}
EXPORT_SYMBOL_GPL(pci_assign_resource_fixed);
#endif

/* Sort resources by alignment */
void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
{
Expand Down

0 comments on commit b812cca

Please sign in to comment.