[PATCH] drivers: sh: Get rid of CONFIG_SHMOBILE_MULTI

[PATCH] drivers: sh: Get rid of CONFIG_SHMOBILE_MULTI

[Geert Uytterhoeven]

Shmobile is all multiplatform these days, so get rid of the reference to
CONFIG_ARCH_SHMOBILE_MULTI.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
This must not be applied to a branch that still has
CONFIG_SHMOBILE_LEGACY.

 drivers/sh/pm_runtime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
index 25abd4eb7d102113..91a003011acfacb2 100644
--- a/drivers/sh/pm_runtime.c
+++ b/drivers/sh/pm_runtime.c
@@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = {
 
 static int __init sh_pm_runtime_init(void)
 {
-	if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) {
+	if (IS_ENABLED(CONFIG_ARCH_SHMOBILE)) {
 		if (!of_find_compatible_node(NULL, NULL,
 					     "renesas,cpg-mstp-clocks"))
 			return 0;
-- 
1.9.1

Re: [PATCH] drivers: sh: Get rid of CONFIG_SHMOBILE_MULTI

[Simon Horman]

On Thu, Aug 27, 2015 at 10:05:06PM +0200, Geert Uytterhoeven wrote:
> Shmobile is all multiplatform these days, so get rid of the reference to
> CONFIG_ARCH_SHMOBILE_MULTI.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> This must not be applied to a branch that still has
> CONFIG_SHMOBILE_LEGACY.

Thanks, I have queued this up for v4.4.

>  drivers/sh/pm_runtime.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
> index 25abd4eb7d102113..91a003011acfacb2 100644
> --- a/drivers/sh/pm_runtime.c
> +++ b/drivers/sh/pm_runtime.c
> @@ -34,7 +34,7 @@ static struct pm_clk_notifier_block platform_bus_notifier = {
>  
>  static int __init sh_pm_runtime_init(void)
>  {
> -	if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) {
> +	if (IS_ENABLED(CONFIG_ARCH_SHMOBILE)) {
>  		if (!of_find_compatible_node(NULL, NULL,
>  					     "renesas,cpg-mstp-clocks"))
>  			return 0;
> -- 
> 1.9.1
> 

Re: [PATCH] drivers: sh: Get rid of CONFIG_SHMOBILE_MULTI

[Simon Horman]

On Mon, Aug 31, 2015 at 03:36:24PM +0900, Simon Horman wrote:
> On Thu, Aug 27, 2015 at 10:05:06PM +0200, Geert Uytterhoeven wrote:
> > Shmobile is all multiplatform these days, so get rid of the reference to
> > CONFIG_ARCH_SHMOBILE_MULTI.
> > 
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > ---
> > This must not be applied to a branch that still has
> > CONFIG_SHMOBILE_LEGACY.
> 
> Thanks, I have queued this up for v4.4.

It seems this patch is a duplicate of "drivers: sh: Get rid of
CONFIG_ARCH_SHMOBILE_MULTI". I have queued up that patch instead of this
one.

Re: [PATCH] drivers: sh: Get rid of CONFIG_SHMOBILE_MULTI

[Geert Uytterhoeven]

Hi Simon,

On Mon, Aug 31, 2015 at 8:40 AM, Simon Horman <horms@verge.net.au> wrote:
> On Mon, Aug 31, 2015 at 03:36:24PM +0900, Simon Horman wrote:
>> On Thu, Aug 27, 2015 at 10:05:06PM +0200, Geert Uytterhoeven wrote:
>> > Shmobile is all multiplatform these days, so get rid of the reference to
>> > CONFIG_ARCH_SHMOBILE_MULTI.
>> >
>> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> > ---
>> > This must not be applied to a branch that still has
>> > CONFIG_SHMOBILE_LEGACY.
>>
>> Thanks, I have queued this up for v4.4.
>
> It seems this patch is a duplicate of "drivers: sh: Get rid of
> CONFIG_ARCH_SHMOBILE_MULTI". I have queued up that patch instead of this
> one.

Yeah, I copied too many lines from Magnus' patches, leading to a missing
"ARCH_" infix ;-) Sorry for that...

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