| Message ID | 1369489718-25869-8-git-send-email-jiang.liu@huawei.com |
|---|---|
| State | Accepted |
| Headers | show |
[+cc m68k and unicore32 maintainers] On Sat, May 25, 2013 at 7:48 AM, Jiang Liu <liuj97@gmail.com> wrote: > pci_scan_bus() and pci_scan_root_bus() has called pci_bus_add_devices() > once, so remove the redundant call of pci_bus_add_devices(). > On the other handle, subsys_init() callbacks will be invoked before > device_init() callbacks, so it should be safe to remove the redundant > calls. > > Signed-off-by: Jiang Liu <jiang.liu@huawei.com> > --- > arch/m68k/platform/coldfire/pci.c | 2 +- > arch/unicore32/kernel/pci.c | 5 ----- > 2 files changed, 1 insertion(+), 6 deletions(-) m68k and unicore32 guys: I plan to apply the patch below. I actually split it into two, one for m68k and another for unicore32. If you object or would rather push it through your trees, let me know. I don't think the rest of the series has any actual dependency on this, so there shouldn't be any problem if you want to take it yourselves. Bjorn > diff --git a/arch/m68k/platform/coldfire/pci.c b/arch/m68k/platform/coldfire/pci.c > index 8572246..2345972 100644 > --- a/arch/m68k/platform/coldfire/pci.c > +++ b/arch/m68k/platform/coldfire/pci.c > @@ -320,7 +320,7 @@ static int __init mcf_pci_init(void) > pci_bus_size_bridges(rootbus); > pci_bus_assign_resources(rootbus); > pci_enable_bridges(rootbus); > - pci_bus_add_devices(rootbus); > + > return 0; > } > > diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c > index ef69c0c..374a055 100644 > --- a/arch/unicore32/kernel/pci.c > +++ b/arch/unicore32/kernel/pci.c > @@ -277,11 +277,6 @@ static int __init pci_common_init(void) > pci_bus_assign_resources(puv3_bus); > } > > - /* > - * Tell drivers about devices found. > - */ > - pci_bus_add_devices(puv3_bus); > - > return 0; > } > subsys_initcall(pci_common_init); > -- > 1.8.1.2 > -- 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
Hi Bjorn, On 06/06/13 07:31, Bjorn Helgaas wrote: > [+cc m68k and unicore32 maintainers] > > On Sat, May 25, 2013 at 7:48 AM, Jiang Liu <liuj97@gmail.com> wrote: >> pci_scan_bus() and pci_scan_root_bus() has called pci_bus_add_devices() >> once, so remove the redundant call of pci_bus_add_devices(). >> On the other handle, subsys_init() callbacks will be invoked before >> device_init() callbacks, so it should be safe to remove the redundant >> calls. >> >> Signed-off-by: Jiang Liu <jiang.liu@huawei.com> >> --- >> arch/m68k/platform/coldfire/pci.c | 2 +- >> arch/unicore32/kernel/pci.c | 5 ----- >> 2 files changed, 1 insertion(+), 6 deletions(-) > > m68k and unicore32 guys: > > I plan to apply the patch below. I actually split it into two, one > for m68k and another for unicore32. If you object or would rather > push it through your trees, let me know. I don't think the rest of > the series has any actual dependency on this, so there shouldn't be > any problem if you want to take it yourselves. I have no objection for m68k, feel free to push it through your tree. I can't test the change in a board that has a PCI card in it right at the moment, but otherwise: Acked-by: Greg Ungerer <gerg@uclinux.org> Regards Greg > Bjorn > >> diff --git a/arch/m68k/platform/coldfire/pci.c b/arch/m68k/platform/coldfire/pci.c >> index 8572246..2345972 100644 >> --- a/arch/m68k/platform/coldfire/pci.c >> +++ b/arch/m68k/platform/coldfire/pci.c >> @@ -320,7 +320,7 @@ static int __init mcf_pci_init(void) >> pci_bus_size_bridges(rootbus); >> pci_bus_assign_resources(rootbus); >> pci_enable_bridges(rootbus); >> - pci_bus_add_devices(rootbus); >> + >> return 0; >> } >> >> diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c >> index ef69c0c..374a055 100644 >> --- a/arch/unicore32/kernel/pci.c >> +++ b/arch/unicore32/kernel/pci.c >> @@ -277,11 +277,6 @@ static int __init pci_common_init(void) >> pci_bus_assign_resources(puv3_bus); >> } >> >> - /* >> - * Tell drivers about devices found. >> - */ >> - pci_bus_add_devices(puv3_bus); >> - >> return 0; >> } >> subsys_initcall(pci_common_init); >> -- >> 1.8.1.2 >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-m68k" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- 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
diff --git a/arch/m68k/platform/coldfire/pci.c b/arch/m68k/platform/coldfire/pci.c index 8572246..2345972 100644 --- a/arch/m68k/platform/coldfire/pci.c +++ b/arch/m68k/platform/coldfire/pci.c @@ -320,7 +320,7 @@ static int __init mcf_pci_init(void) pci_bus_size_bridges(rootbus); pci_bus_assign_resources(rootbus); pci_enable_bridges(rootbus); - pci_bus_add_devices(rootbus); + return 0; } diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index ef69c0c..374a055 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c @@ -277,11 +277,6 @@ static int __init pci_common_init(void) pci_bus_assign_resources(puv3_bus); } - /* - * Tell drivers about devices found. - */ - pci_bus_add_devices(puv3_bus); - return 0; } subsys_initcall(pci_common_init);
pci_scan_bus() and pci_scan_root_bus() has called pci_bus_add_devices() once, so remove the redundant call of pci_bus_add_devices(). On the other handle, subsys_init() callbacks will be invoked before device_init() callbacks, so it should be safe to remove the redundant calls. Signed-off-by: Jiang Liu <jiang.liu@huawei.com> --- arch/m68k/platform/coldfire/pci.c | 2 +- arch/unicore32/kernel/pci.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-)