Skip to content

Commit

Permalink
PCI: Return early on allocation failures to unindent mainline code
Browse files Browse the repository at this point in the history
On allocation failure, return early so the main body of the function
doesn't have to be indented as the body of an "if" statement.  No
functional change.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Bjorn Helgaas committed Jun 14, 2013
1 parent dc087f2 commit 0501348
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions drivers/pci/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,20 +451,21 @@ void pci_read_bridge_bases(struct pci_bus *child)
}
}

static struct pci_bus * pci_alloc_bus(void)
static struct pci_bus *pci_alloc_bus(void)
{
struct pci_bus *b;

b = kzalloc(sizeof(*b), GFP_KERNEL);
if (b) {
INIT_LIST_HEAD(&b->node);
INIT_LIST_HEAD(&b->children);
INIT_LIST_HEAD(&b->devices);
INIT_LIST_HEAD(&b->slots);
INIT_LIST_HEAD(&b->resources);
b->max_bus_speed = PCI_SPEED_UNKNOWN;
b->cur_bus_speed = PCI_SPEED_UNKNOWN;
}
if (!b)
return NULL;

INIT_LIST_HEAD(&b->node);
INIT_LIST_HEAD(&b->children);
INIT_LIST_HEAD(&b->devices);
INIT_LIST_HEAD(&b->slots);
INIT_LIST_HEAD(&b->resources);
b->max_bus_speed = PCI_SPEED_UNKNOWN;
b->cur_bus_speed = PCI_SPEED_UNKNOWN;
return b;
}

Expand All @@ -485,11 +486,11 @@ static struct pci_host_bridge *pci_alloc_host_bridge(struct pci_bus *b)
struct pci_host_bridge *bridge;

bridge = kzalloc(sizeof(*bridge), GFP_KERNEL);
if (bridge) {
INIT_LIST_HEAD(&bridge->windows);
bridge->bus = b;
}
if (!bridge)
return NULL;

INIT_LIST_HEAD(&bridge->windows);
bridge->bus = b;
return bridge;
}

Expand Down

0 comments on commit 0501348

Please sign in to comment.