Patchwork xtensa/PCI: Mark pcibios_fixup_bus() as non-init

login
register
mail settings
Submitter Bjorn Helgaas
Date July 2, 2013, 6:29 p.m.
Message ID <20130702182942.28572.82708.stgit@bhelgaas-glaptop>
Download mbox | patch
Permalink /patch/256474/
State Not Applicable
Headers show

Comments

Bjorn Helgaas - July 2, 2013, 6:29 p.m.
pcibios_fixup_bus() is called by pci_scan_child_bus(), which is not marked
__init.  Therefore, pcibios_fixup_bus() cannot be marked __init either.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 arch/xtensa/kernel/pci.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Max Filippov - July 3, 2013, 1:26 a.m.
Hi Bjorn,

On Tue, Jul 2, 2013 at 10:29 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> pcibios_fixup_bus() is called by pci_scan_child_bus(), which is not marked
> __init.  Therefore, pcibios_fixup_bus() cannot be marked __init either.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
>  arch/xtensa/kernel/pci.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
> index 126c188..56693dd 100644
> --- a/arch/xtensa/kernel/pci.c
> +++ b/arch/xtensa/kernel/pci.c
> @@ -197,7 +197,7 @@ static int __init pcibios_init(void)
>
>  subsys_initcall(pcibios_init);
>
> -void __init pcibios_fixup_bus(struct pci_bus *bus)
> +void pcibios_fixup_bus(struct pci_bus *bus)
>  {
>         if (bus->parent) {
>                 /* This is a subordinate bridge */
>

Similar patch is already in the xtensa-linux/for_next branch:
https://github.com/czankel/xtensa-linux/commit/fd95ee7380ae973c6f11b897af6ef9d253a1df9e
Bjorn Helgaas - July 3, 2013, 3:38 a.m.
On Tue, Jul 2, 2013 at 7:26 PM, Max Filippov <jcmvbkbc@gmail.com> wrote:
> Hi Bjorn,
>
> On Tue, Jul 2, 2013 at 10:29 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
>> pcibios_fixup_bus() is called by pci_scan_child_bus(), which is not marked
>> __init.  Therefore, pcibios_fixup_bus() cannot be marked __init either.
>>
>> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
>> ---
>>  arch/xtensa/kernel/pci.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
>> index 126c188..56693dd 100644
>> --- a/arch/xtensa/kernel/pci.c
>> +++ b/arch/xtensa/kernel/pci.c
>> @@ -197,7 +197,7 @@ static int __init pcibios_init(void)
>>
>>  subsys_initcall(pcibios_init);
>>
>> -void __init pcibios_fixup_bus(struct pci_bus *bus)
>> +void pcibios_fixup_bus(struct pci_bus *bus)
>>  {
>>         if (bus->parent) {
>>                 /* This is a subordinate bridge */
>>
>
> Similar patch is already in the xtensa-linux/for_next branch:
> https://github.com/czankel/xtensa-linux/commit/fd95ee7380ae973c6f11b897af6ef9d253a1df9e

Great, thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index 126c188..56693dd 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -197,7 +197,7 @@  static int __init pcibios_init(void)
 
 subsys_initcall(pcibios_init);
 
-void __init pcibios_fixup_bus(struct pci_bus *bus)
+void pcibios_fixup_bus(struct pci_bus *bus)
 {
 	if (bus->parent) {
 		/* This is a subordinate bridge */