[PATCH 2/2 v2] omap3:pm: remove omap3_[mpu|dsp|l3]_rate_tables

[PATCH 2/2 v2] omap3:pm: remove omap3_[mpu|dsp|l3]_rate_tables

[Nishanth Menon]

since _rate_tables are initializing mpu_opps, dsp_opps  and l3_opps
it makes no sense in having these initialize just once. optimize
these out

Signed-off-by: Nishanth Menon <nm@ti.com>
---
v2: cleaned up omap3-opp.h -> leaving this file still here in case
we will need to add omap3 specific exported stuff here. Apologies
on the spam.. realized this a bit late..
v1: original cleanup of pm34xx.c

 arch/arm/mach-omap2/omap3-opp.h |    4 ----
 arch/arm/mach-omap2/pm34xx.c    |   15 +++------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-omap2/omap3-opp.h b/arch/arm/mach-omap2/omap3-opp.h
index 994d8d4..b47bb44 100644
--- a/arch/arm/mach-omap2/omap3-opp.h
+++ b/arch/arm/mach-omap2/omap3-opp.h
@@ -3,8 +3,4 @@
 
 #include <plat/omap-pm.h>
 
-extern struct omap_opp *omap3_mpu_rate_table;
-extern struct omap_opp *omap3_dsp_rate_table;
-extern struct omap_opp *omap3_l3_rate_table;
-
 #endif
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index d7646ba..9744a35 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -189,11 +189,6 @@ static struct omap_opp_def __initdata omap36xx_dsp_rate_table[] = {
 	OMAP_OPP_DEF(0, 0, 0)
 };
 
-/* OMAP3 Rate Table */
-struct omap_opp *omap3_mpu_rate_table;
-struct omap_opp *omap3_dsp_rate_table;
-struct omap_opp *omap3_l3_rate_table;
-
 static inline void omap3_per_save_context(void)
 {
 	omap_gpio_save_context();
@@ -1365,9 +1360,9 @@ void __init omap3_pm_init_opp_table(void)
 		omap36xx_dsp_rate_table
 	};
 	struct omap_opp **omap3_rate_tables[] = {
-		&omap3_mpu_rate_table,
-		&omap3_l3_rate_table,
-		&omap3_dsp_rate_table
+		&mpu_opps,
+		&dsp_opps,
+		&l3_opps
 	};
 
 	omap3_opp_def_list = cpu_is_omap3630() ? omap36xx_opp_def_list :
@@ -1377,10 +1372,6 @@ void __init omap3_pm_init_opp_table(void)
 		/* We dont want half configured system at the moment */
 		BUG_ON(IS_ERR(omap3_rate_tables[i]));
 	}
-
-	mpu_opps = omap3_mpu_rate_table;
-	dsp_opps = omap3_dsp_rate_table;
-	l3_opps = omap3_l3_rate_table;
 }
 
 static int __init omap3_pm_early_init(void)
-- 
1.6.3.3

Re: [PATCH 2/2 v2] omap3:pm: remove omap3_[mpu|dsp|l3]_rate_tables

[Kevin Hilman]

Nishanth Menon <nm@ti.com> writes:

> since _rate_tables are initializing mpu_opps, dsp_opps  and l3_opps
> it makes no sense in having these initialize just once. optimize
> these out
>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
> v2: cleaned up omap3-opp.h -> leaving this file still here in case
> we will need to add omap3 specific exported stuff here. Apologies
> on the spam.. realized this a bit late..
> v1: original cleanup of pm34xx.c

Acked-by: Kevin Hilman <khilman@deeprootsystems.com>

Adding this series to pm-wip-opp.

Kevin

>  arch/arm/mach-omap2/omap3-opp.h |    4 ----
>  arch/arm/mach-omap2/pm34xx.c    |   15 +++------------
>  2 files changed, 3 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap3-opp.h b/arch/arm/mach-omap2/omap3-opp.h
> index 994d8d4..b47bb44 100644
> --- a/arch/arm/mach-omap2/omap3-opp.h
> +++ b/arch/arm/mach-omap2/omap3-opp.h
> @@ -3,8 +3,4 @@
>  
>  #include <plat/omap-pm.h>
>  
> -extern struct omap_opp *omap3_mpu_rate_table;
> -extern struct omap_opp *omap3_dsp_rate_table;
> -extern struct omap_opp *omap3_l3_rate_table;
> -
>  #endif
> diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
> index d7646ba..9744a35 100644
> --- a/arch/arm/mach-omap2/pm34xx.c
> +++ b/arch/arm/mach-omap2/pm34xx.c
> @@ -189,11 +189,6 @@ static struct omap_opp_def __initdata omap36xx_dsp_rate_table[] = {
>  	OMAP_OPP_DEF(0, 0, 0)
>  };
>  
> -/* OMAP3 Rate Table */
> -struct omap_opp *omap3_mpu_rate_table;
> -struct omap_opp *omap3_dsp_rate_table;
> -struct omap_opp *omap3_l3_rate_table;
> -
>  static inline void omap3_per_save_context(void)
>  {
>  	omap_gpio_save_context();
> @@ -1365,9 +1360,9 @@ void __init omap3_pm_init_opp_table(void)
>  		omap36xx_dsp_rate_table
>  	};
>  	struct omap_opp **omap3_rate_tables[] = {
> -		&omap3_mpu_rate_table,
> -		&omap3_l3_rate_table,
> -		&omap3_dsp_rate_table
> +		&mpu_opps,
> +		&dsp_opps,
> +		&l3_opps
>  	};
>  
>  	omap3_opp_def_list = cpu_is_omap3630() ? omap36xx_opp_def_list :
> @@ -1377,10 +1372,6 @@ void __init omap3_pm_init_opp_table(void)
>  		/* We dont want half configured system at the moment */
>  		BUG_ON(IS_ERR(omap3_rate_tables[i]));
>  	}
> -
> -	mpu_opps = omap3_mpu_rate_table;
> -	dsp_opps = omap3_dsp_rate_table;
> -	l3_opps = omap3_l3_rate_table;
>  }
>  
>  static int __init omap3_pm_early_init(void)
> -- 
> 1.6.3.3