* [PATCH 1/2] ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay()
@ 2014-10-17 12:24 Geert Uytterhoeven
2014-10-23 10:25 ` Laurent Pinchart
2014-10-24 2:08 ` Simon Horman
0 siblings, 2 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2014-10-17 12:24 UTC (permalink / raw)
To: linux-sh
r8a7778_init_delay() just calls shmobile_init_delay(), hence replace
calls to it by direct calls to shmobile_init_delay().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/r8a7778.h | 1 -
arch/arm/mach-shmobile/setup-r8a7778.c | 7 +------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/arm/mach-shmobile/r8a7778.h b/arch/arm/mach-shmobile/r8a7778.h
index f4076a50e970a357..4802cee250bea893 100644
--- a/arch/arm/mach-shmobile/r8a7778.h
+++ b/arch/arm/mach-shmobile/r8a7778.h
@@ -71,7 +71,6 @@ extern void r8a7778_add_standard_devices_dt(void);
extern void r8a7778_add_dt_devices(void);
extern void r8a7778_init_late(void);
-extern void r8a7778_init_delay(void);
extern void r8a7778_init_irq_dt(void);
extern void r8a7778_clock_init(void);
extern void r8a7778_init_irq_extpin(int irlm);
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 85fe016d6a872a62..97eac8703d4d8ee7 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -572,11 +572,6 @@ void __init r8a7778_init_irq_extpin(int irlm)
&irqpin_platform_data, sizeof(irqpin_platform_data));
}
-void __init r8a7778_init_delay(void)
-{
- shmobile_init_delay();
-}
-
#ifdef CONFIG_USE_OF
#define INT2SMSKCR0 0x82288 /* 0xfe782288 */
#define INT2SMSKCR1 0x8228c /* 0xfe78228c */
@@ -608,7 +603,7 @@ static const char *r8a7778_compat_dt[] __initdata = {
};
DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
- .init_early = r8a7778_init_delay,
+ .init_early = shmobile_init_delay,
.init_irq = r8a7778_init_irq_dt,
.init_late = shmobile_init_late,
.dt_compat = r8a7778_compat_dt,
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay()
2014-10-17 12:24 [PATCH 1/2] ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay() Geert Uytterhoeven
@ 2014-10-23 10:25 ` Laurent Pinchart
2014-10-24 2:08 ` Simon Horman
1 sibling, 0 replies; 5+ messages in thread
From: Laurent Pinchart @ 2014-10-23 10:25 UTC (permalink / raw)
To: linux-sh
Hi Geert,
Thank you for the patch.
On Friday 17 October 2014 14:24:38 Geert Uytterhoeven wrote:
> r8a7778_init_delay() just calls shmobile_init_delay(), hence replace
> calls to it by direct calls to shmobile_init_delay().
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> arch/arm/mach-shmobile/r8a7778.h | 1 -
> arch/arm/mach-shmobile/setup-r8a7778.c | 7 +------
> 2 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/r8a7778.h
> b/arch/arm/mach-shmobile/r8a7778.h index f4076a50e970a357..4802cee250bea893
> 100644
> --- a/arch/arm/mach-shmobile/r8a7778.h
> +++ b/arch/arm/mach-shmobile/r8a7778.h
> @@ -71,7 +71,6 @@ extern void r8a7778_add_standard_devices_dt(void);
> extern void r8a7778_add_dt_devices(void);
>
> extern void r8a7778_init_late(void);
> -extern void r8a7778_init_delay(void);
> extern void r8a7778_init_irq_dt(void);
> extern void r8a7778_clock_init(void);
> extern void r8a7778_init_irq_extpin(int irlm);
> diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c
> b/arch/arm/mach-shmobile/setup-r8a7778.c index
> 85fe016d6a872a62..97eac8703d4d8ee7 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7778.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7778.c
> @@ -572,11 +572,6 @@ void __init r8a7778_init_irq_extpin(int irlm)
> &irqpin_platform_data, sizeof(irqpin_platform_data));
> }
>
> -void __init r8a7778_init_delay(void)
> -{
> - shmobile_init_delay();
> -}
> -
> #ifdef CONFIG_USE_OF
> #define INT2SMSKCR0 0x82288 /* 0xfe782288 */
> #define INT2SMSKCR1 0x8228c /* 0xfe78228c */
> @@ -608,7 +603,7 @@ static const char *r8a7778_compat_dt[] __initdata = {
> };
>
> DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
> - .init_early = r8a7778_init_delay,
> + .init_early = shmobile_init_delay,
> .init_irq = r8a7778_init_irq_dt,
> .init_late = shmobile_init_late,
> .dt_compat = r8a7778_compat_dt,
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay()
2014-10-17 12:24 [PATCH 1/2] ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay() Geert Uytterhoeven
2014-10-23 10:25 ` Laurent Pinchart
@ 2014-10-24 2:08 ` Simon Horman
1 sibling, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-10-24 2:08 UTC (permalink / raw)
To: linux-sh
On Fri, Oct 17, 2014 at 02:24:38PM +0200, Geert Uytterhoeven wrote:
> r8a7778_init_delay() just calls shmobile_init_delay(), hence replace
> calls to it by direct calls to shmobile_init_delay().
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Thanks, I have queued this up.
> ---
> arch/arm/mach-shmobile/r8a7778.h | 1 -
> arch/arm/mach-shmobile/setup-r8a7778.c | 7 +------
> 2 files changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/r8a7778.h b/arch/arm/mach-shmobile/r8a7778.h
> index f4076a50e970a357..4802cee250bea893 100644
> --- a/arch/arm/mach-shmobile/r8a7778.h
> +++ b/arch/arm/mach-shmobile/r8a7778.h
> @@ -71,7 +71,6 @@ extern void r8a7778_add_standard_devices_dt(void);
> extern void r8a7778_add_dt_devices(void);
>
> extern void r8a7778_init_late(void);
> -extern void r8a7778_init_delay(void);
> extern void r8a7778_init_irq_dt(void);
> extern void r8a7778_clock_init(void);
> extern void r8a7778_init_irq_extpin(int irlm);
> diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
> index 85fe016d6a872a62..97eac8703d4d8ee7 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7778.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7778.c
> @@ -572,11 +572,6 @@ void __init r8a7778_init_irq_extpin(int irlm)
> &irqpin_platform_data, sizeof(irqpin_platform_data));
> }
>
> -void __init r8a7778_init_delay(void)
> -{
> - shmobile_init_delay();
> -}
> -
> #ifdef CONFIG_USE_OF
> #define INT2SMSKCR0 0x82288 /* 0xfe782288 */
> #define INT2SMSKCR1 0x8228c /* 0xfe78228c */
> @@ -608,7 +603,7 @@ static const char *r8a7778_compat_dt[] __initdata = {
> };
>
> DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
> - .init_early = r8a7778_init_delay,
> + .init_early = shmobile_init_delay,
> .init_irq = r8a7778_init_irq_dt,
> .init_late = shmobile_init_late,
> .dt_compat = r8a7778_compat_dt,
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay()
2014-10-29 5:00 [GIT PULL] Renesas ARM Based SoC Soc Cleanups for v3.19 Simon Horman
@ 2014-10-29 5:00 ` Simon Horman
0 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-10-29 5:00 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
r8a7778_init_delay() just calls shmobile_init_delay(), hence replace
calls to it by direct calls to shmobile_init_delay().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/r8a7778.h | 1 -
arch/arm/mach-shmobile/setup-r8a7778.c | 7 +------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/arm/mach-shmobile/r8a7778.h b/arch/arm/mach-shmobile/r8a7778.h
index f4076a5..4802cee 100644
--- a/arch/arm/mach-shmobile/r8a7778.h
+++ b/arch/arm/mach-shmobile/r8a7778.h
@@ -71,7 +71,6 @@ extern void r8a7778_add_standard_devices_dt(void);
extern void r8a7778_add_dt_devices(void);
extern void r8a7778_init_late(void);
-extern void r8a7778_init_delay(void);
extern void r8a7778_init_irq_dt(void);
extern void r8a7778_clock_init(void);
extern void r8a7778_init_irq_extpin(int irlm);
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 85fe016..97eac87 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -572,11 +572,6 @@ void __init r8a7778_init_irq_extpin(int irlm)
&irqpin_platform_data, sizeof(irqpin_platform_data));
}
-void __init r8a7778_init_delay(void)
-{
- shmobile_init_delay();
-}
-
#ifdef CONFIG_USE_OF
#define INT2SMSKCR0 0x82288 /* 0xfe782288 */
#define INT2SMSKCR1 0x8228c /* 0xfe78228c */
@@ -608,7 +603,7 @@ static const char *r8a7778_compat_dt[] __initdata = {
};
DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
- .init_early = r8a7778_init_delay,
+ .init_early = shmobile_init_delay,
.init_irq = r8a7778_init_irq_dt,
.init_late = shmobile_init_late,
.dt_compat = r8a7778_compat_dt,
--
2.1.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay()
@ 2014-10-29 5:00 ` Simon Horman
0 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-10-29 5:00 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
r8a7778_init_delay() just calls shmobile_init_delay(), hence replace
calls to it by direct calls to shmobile_init_delay().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/r8a7778.h | 1 -
arch/arm/mach-shmobile/setup-r8a7778.c | 7 +------
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/arm/mach-shmobile/r8a7778.h b/arch/arm/mach-shmobile/r8a7778.h
index f4076a5..4802cee 100644
--- a/arch/arm/mach-shmobile/r8a7778.h
+++ b/arch/arm/mach-shmobile/r8a7778.h
@@ -71,7 +71,6 @@ extern void r8a7778_add_standard_devices_dt(void);
extern void r8a7778_add_dt_devices(void);
extern void r8a7778_init_late(void);
-extern void r8a7778_init_delay(void);
extern void r8a7778_init_irq_dt(void);
extern void r8a7778_clock_init(void);
extern void r8a7778_init_irq_extpin(int irlm);
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 85fe016..97eac87 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -572,11 +572,6 @@ void __init r8a7778_init_irq_extpin(int irlm)
&irqpin_platform_data, sizeof(irqpin_platform_data));
}
-void __init r8a7778_init_delay(void)
-{
- shmobile_init_delay();
-}
-
#ifdef CONFIG_USE_OF
#define INT2SMSKCR0 0x82288 /* 0xfe782288 */
#define INT2SMSKCR1 0x8228c /* 0xfe78228c */
@@ -608,7 +603,7 @@ static const char *r8a7778_compat_dt[] __initdata = {
};
DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
- .init_early = r8a7778_init_delay,
+ .init_early = shmobile_init_delay,
.init_irq = r8a7778_init_irq_dt,
.init_late = shmobile_init_late,
.dt_compat = r8a7778_compat_dt,
--
2.1.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-10-29 5:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-17 12:24 [PATCH 1/2] ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay() Geert Uytterhoeven
2014-10-23 10:25 ` Laurent Pinchart
2014-10-24 2:08 ` Simon Horman
2014-10-29 5:00 [GIT PULL] Renesas ARM Based SoC Soc Cleanups for v3.19 Simon Horman
2014-10-29 5:00 ` [PATCH 1/2] ARM: shmobile: r8a7778: Remove wrapper r8a7778_init_delay() Simon Horman
2014-10-29 5:00 ` Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.