diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-12-11 11:02:07 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-11 13:42:31 +1100 |
| commit | e60516e3d0bbde450acf4397b0d01b03042a7d57 (patch) | |
| tree | b212b1b6881346b9e21a11925c134e2bf8f9be85 /arch/powerpc/kernel/pci-common.c | |
| parent | 53761746ec98c526c7d82dcf8246cbde9f09e743 (diff) | |
[POWERPC] Inline pci_setup_pci_controller as it has become trivial
and it becomes clear that we should use zalloc_maybe_bootmem.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 15ec71a84f78..78cdb700451c 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -50,27 +50,18 @@ static DEFINE_SPINLOCK(hose_spinlock); /* XXX kill that some day ... */ static int global_phb_number; /* Global phb counter */ -/* - * pci_controller(phb) initialized common variables. - */ -static void __devinit pci_setup_pci_controller(struct pci_controller *hose) -{ - memset(hose, 0, sizeof(struct pci_controller)); - spin_lock(&hose_spinlock); - hose->global_number = global_phb_number++; - list_add_tail(&hose->list_node, &hose_list); - spin_unlock(&hose_spinlock); -} - -struct pci_controller * pcibios_alloc_controller(struct device_node *dev) +struct pci_controller *pcibios_alloc_controller(struct device_node *dev) { struct pci_controller *phb; - phb = alloc_maybe_bootmem(sizeof(struct pci_controller), GFP_KERNEL); + phb = zalloc_maybe_bootmem(sizeof(struct pci_controller), GFP_KERNEL); if (phb == NULL) return NULL; - pci_setup_pci_controller(phb); + spin_lock(&hose_spinlock); + phb->global_number = global_phb_number++; + list_add_tail(&phb->list_node, &hose_list); + spin_unlock(&hose_spinlock); phb->arch_data = dev; phb->is_dynamic = mem_init_done; #ifdef CONFIG_PPC64 |