diff mbox

[8/9] ARM: ux500: Clean-up temporary Device Tree enablement helpers

Message ID 1341493572-29735-9-git-send-email-lee.jones@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Lee Jones July 5, 2012, 1:06 p.m. UTC
Here we remove some of the extra overhead we introduced to make
DT:ing the Snowball platform easier. Unfortunately we can't
remove everything. We are forced to leave cpufreq and DMA behind
until they have been successfully Device Tree enabled.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/cpu-db8500.c |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

Comments

Linus Walleij July 6, 2012, 7:23 a.m. UTC | #1
On Thu, Jul 5, 2012 at 3:06 PM, Lee Jones <lee.jones@linaro.org> wrote:

> Here we remove some of the extra overhead we introduced to make
> DT:ing the Snowball platform easier. Unfortunately we can't
> remove everything. We are forced to leave cpufreq and DMA behind
> until they have been successfully Device Tree enabled.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

The patch is straight-forward but the commit message is confusing.

This just simplifies the code, the last two sentences about leaving
cpufreq and DMA behind you can put in your weekly report or
something :-)

Yours,
Linus Walleij
Lee Jones July 6, 2012, 8:33 a.m. UTC | #2
Hi Linus,

Is this a NAK, or did you just miss it?

On 05/07/12 14:06, Lee Jones wrote:
> Here we remove some of the extra overhead we introduced to make
> DT:ing the Snowball platform easier. Unfortunately we can't
> remove everything. We are forced to leave cpufreq and DMA behind
> until they have been successfully Device Tree enabled.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>   arch/arm/mach-ux500/cpu-db8500.c |   10 ++--------
>   1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
> index c8dd94f..d7a28c0 100644
> --- a/arch/arm/mach-ux500/cpu-db8500.c
> +++ b/arch/arm/mach-ux500/cpu-db8500.c
> @@ -137,10 +137,6 @@ static struct platform_device *platform_devs[] __initdata = {
>   	&db8500_prcmu_device,
>   };
>
> -static struct platform_device *of_platform_devs[] __initdata = {
> -	&u8500_dma40_device,
> -};
> -
>   static resource_size_t __initdata db8500_gpio_base[] = {
>   	U8500_GPIOBANK0_BASE,
>   	U8500_GPIOBANK1_BASE,
> @@ -232,7 +228,6 @@ struct device * __init u8500_init_devices(void)
>   struct device * __init u8500_of_init_devices(void)
>   {
>   	struct device *parent;
> -	int i;
>
>   	parent = db8500_soc_device_init();
>
> @@ -241,8 +236,7 @@ struct device * __init u8500_of_init_devices(void)
>   	platform_device_register_data(parent,
>   		"cpufreq-u8500", -1, NULL, 0);
>
> -	for (i = 0; i < ARRAY_SIZE(of_platform_devs); i++)
> -		of_platform_devs[i]->dev.parent = parent;
> +	u8500_dma40_device.dev.parent = parent;
>
>   	/*
>   	 * Devices to be DT:ed:
> @@ -250,7 +244,7 @@ struct device * __init u8500_of_init_devices(void)
>   	 *   db8500_pmu_device   = done
>   	 *   db8500_prcmu_device = done
>   	 */
> -	platform_add_devices(of_platform_devs, ARRAY_SIZE(of_platform_devs));
> +	platform_device_register(&u8500_dma40_device);
>
>   	return parent;
>   }
>
Linus Walleij July 8, 2012, 7:11 p.m. UTC | #3
On Fri, Jul 6, 2012 at 10:33 AM, Lee Jones <lee.jones@linaro.org> wrote:

> Is this a NAK, or did you just miss it?

I have replied to this patch that I want the commit message changed,
didn't you get it?

I'll forward.

Linus
diff mbox

Patch

diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index c8dd94f..d7a28c0 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -137,10 +137,6 @@  static struct platform_device *platform_devs[] __initdata = {
 	&db8500_prcmu_device,
 };
 
-static struct platform_device *of_platform_devs[] __initdata = {
-	&u8500_dma40_device,
-};
-
 static resource_size_t __initdata db8500_gpio_base[] = {
 	U8500_GPIOBANK0_BASE,
 	U8500_GPIOBANK1_BASE,
@@ -232,7 +228,6 @@  struct device * __init u8500_init_devices(void)
 struct device * __init u8500_of_init_devices(void)
 {
 	struct device *parent;
-	int i;
 
 	parent = db8500_soc_device_init();
 
@@ -241,8 +236,7 @@  struct device * __init u8500_of_init_devices(void)
 	platform_device_register_data(parent,
 		"cpufreq-u8500", -1, NULL, 0);
 
-	for (i = 0; i < ARRAY_SIZE(of_platform_devs); i++)
-		of_platform_devs[i]->dev.parent = parent;
+	u8500_dma40_device.dev.parent = parent;
 
 	/*
 	 * Devices to be DT:ed:
@@ -250,7 +244,7 @@  struct device * __init u8500_of_init_devices(void)
 	 *   db8500_pmu_device   = done
 	 *   db8500_prcmu_device = done
 	 */
-	platform_add_devices(of_platform_devs, ARRAY_SIZE(of_platform_devs));
+	platform_device_register(&u8500_dma40_device);
 
 	return parent;
 }