Skip to content

Commit

Permalink
MIPS/PCI: adjust section annotations for pcibios_setup()
Browse files Browse the repository at this point in the history
Make pcibios_setup() consistently use the "__init" section annotation.

Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Myron Stowe authored and Bjorn Helgaas committed Jul 5, 2012
1 parent 11206c9 commit 938ca51
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions arch/mips/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
vma->vm_end - vma->vm_start, vma->vm_page_prot);
}

char * (*pcibios_plat_setup)(char *str) __devinitdata;
char * (*pcibios_plat_setup)(char *str) __initdata;

char *__devinit pcibios_setup(char *str)
char *__init pcibios_setup(char *str)
{
if (pcibios_plat_setup)
return pcibios_plat_setup(str);
Expand Down
4 changes: 2 additions & 2 deletions arch/mips/txx9/generic/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,9 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
return txx9_board_vec->pci_map_irq(dev, slot, pin);
}

char * (*txx9_board_pcibios_setup)(char *str) __devinitdata;
char * (*txx9_board_pcibios_setup)(char *str) __initdata;

char *__devinit txx9_pcibios_setup(char *str)
char *__init txx9_pcibios_setup(char *str)
{
if (txx9_board_pcibios_setup && !txx9_board_pcibios_setup(str))
return NULL;
Expand Down

0 comments on commit 938ca51

Please sign in to comment.