diff mbox

ARM: shmobile: Remove unneeded check in SMP initialization

Message ID 1475663291-4502-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive)
State Rejected
Headers show

Commit Message

Laurent Pinchart Oct. 5, 2016, 10:28 a.m. UTC
The SMP initialization function is only called if CONFIG_SMP is defined.
Remove the duplicate check.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/mach-shmobile/platsmp.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Geert Uytterhoeven Oct. 5, 2016, 11:25 a.m. UTC | #1
Hi Laurent,

On Wed, Oct 5, 2016 at 12:28 PM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The SMP initialization function is only called if CONFIG_SMP is defined.
> Remove the duplicate check.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  arch/arm/mach-shmobile/platsmp.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c
> index 02e21bceb085..48595a397220 100644
> --- a/arch/arm/mach-shmobile/platsmp.c
> +++ b/arch/arm/mach-shmobile/platsmp.c
> @@ -39,9 +39,5 @@ bool shmobile_smp_cpu_can_disable(unsigned int cpu)
>
>  bool __init shmobile_smp_init_fallback_ops(void)
>  {
> -       /* fallback on PSCI/smp_ops if no other DT based method is detected */
> -       if (!IS_ENABLED(CONFIG_SMP))
> -               return false;
> -
>         return platform_can_secondary_boot() ? true : false;
>  }

This check was added recently, because the UP build was broken.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Laurent Pinchart Oct. 5, 2016, 1:04 p.m. UTC | #2
Hi Geert,

On Wednesday 05 Oct 2016 13:25:12 Geert Uytterhoeven wrote:
> On Wed, Oct 5, 2016 at 12:28 PM, Laurent Pinchart wrote:
> > The SMP initialization function is only called if CONFIG_SMP is defined.
> > Remove the duplicate check.
> > 
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> > 
> >  arch/arm/mach-shmobile/platsmp.c | 4 ----
> >  1 file changed, 4 deletions(-)
> > 
> > diff --git a/arch/arm/mach-shmobile/platsmp.c
> > b/arch/arm/mach-shmobile/platsmp.c index 02e21bceb085..48595a397220
> > 100644
> > --- a/arch/arm/mach-shmobile/platsmp.c
> > +++ b/arch/arm/mach-shmobile/platsmp.c
> > @@ -39,9 +39,5 @@ bool shmobile_smp_cpu_can_disable(unsigned int cpu)
> > 
> >  bool __init shmobile_smp_init_fallback_ops(void)
> >  {
> > -       /* fallback on PSCI/smp_ops if no other DT based method is
> > detected */
> > -       if (!IS_ENABLED(CONFIG_SMP))
> > -               return false;
> > -
> >         return platform_can_secondary_boot() ? true : false;
> >  }
> 
> This check was added recently, because the UP build was broken.

I should have found that out. Sorry about the noise and thanks for the review.
Simon Horman Oct. 7, 2016, 3:27 a.m. UTC | #3
On Wed, Oct 05, 2016 at 04:04:39PM +0300, Laurent Pinchart wrote:
> Hi Geert,
> 
> On Wednesday 05 Oct 2016 13:25:12 Geert Uytterhoeven wrote:
> > On Wed, Oct 5, 2016 at 12:28 PM, Laurent Pinchart wrote:
> > > The SMP initialization function is only called if CONFIG_SMP is defined.
> > > Remove the duplicate check.
> > > 
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > > ---
> > > 
> > >  arch/arm/mach-shmobile/platsmp.c | 4 ----
> > >  1 file changed, 4 deletions(-)
> > > 
> > > diff --git a/arch/arm/mach-shmobile/platsmp.c
> > > b/arch/arm/mach-shmobile/platsmp.c index 02e21bceb085..48595a397220
> > > 100644
> > > --- a/arch/arm/mach-shmobile/platsmp.c
> > > +++ b/arch/arm/mach-shmobile/platsmp.c
> > > @@ -39,9 +39,5 @@ bool shmobile_smp_cpu_can_disable(unsigned int cpu)
> > > 
> > >  bool __init shmobile_smp_init_fallback_ops(void)
> > >  {
> > > -       /* fallback on PSCI/smp_ops if no other DT based method is
> > > detected */
> > > -       if (!IS_ENABLED(CONFIG_SMP))
> > > -               return false;
> > > -
> > >         return platform_can_secondary_boot() ? true : false;
> > >  }
> > 
> > This check was added recently, because the UP build was broken.
> 
> I should have found that out. Sorry about the noise and thanks for the review.

I am discarding this patch. Let me know if that was not what you were
after.
diff mbox

Patch

diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c
index 02e21bceb085..48595a397220 100644
--- a/arch/arm/mach-shmobile/platsmp.c
+++ b/arch/arm/mach-shmobile/platsmp.c
@@ -39,9 +39,5 @@  bool shmobile_smp_cpu_can_disable(unsigned int cpu)
 
 bool __init shmobile_smp_init_fallback_ops(void)
 {
-	/* fallback on PSCI/smp_ops if no other DT based method is detected */
-	if (!IS_ENABLED(CONFIG_SMP))
-		return false;
-
 	return platform_can_secondary_boot() ? true : false;
 }