[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120626033137.16434.79166.stgit@amt.stowe>
Date: Mon, 25 Jun 2012 21:31:37 -0600
From: Myron Stowe <myron.stowe@...hat.com>
To: bhelgaas@...gle.com
Cc: linux-pci@...r.kernel.org, rth@...ddle.net,
ink@...assic.park.msu.ru, mattst88@...il.com,
linux@....linux.org.uk, starvik@...s.com, jesper.nilsson@...s.com,
tony.luck@...el.com, fenghua.yu@...el.com, monstr@...str.eu,
ralf@...ux-mips.org, yasutake.koichi@...panasonic.com,
jejb@...isc-linux.org, deller@....de, benh@...nel.crashing.org,
paulus@...ba.org, lethal@...ux-sh.org, davem@...emloft.net,
cmetcalf@...era.com, gxt@...c.pku.edu.cn, tglx@...utronix.de,
mingo@...hat.com, hpa@...or.com, x86@...nel.org, chris@...kel.net,
linux-kernel@...r.kernel.org
Subject: [PATCH 06/16] MIPS/PCI: adjust section annotations for
'pcibios_setup()'
Make pcibios_setup() consistently use the "__init" section annotation.
Signed-off-by: Myron Stowe <myron.stowe@...hat.com>
---
arch/mips/pci/pci.c | 4 ++--
arch/mips/txx9/generic/pci.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 271e8c4..0e111d2 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -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);
diff --git a/arch/mips/txx9/generic/pci.c b/arch/mips/txx9/generic/pci.c
index 682efb0..f028e3d 100644
--- a/arch/mips/txx9/generic/pci.c
+++ b/arch/mips/txx9/generic/pci.c
@@ -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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists