ARM: OMAP1/2: clock: Remove unused mpurate cmdline option

The 'mpurate' option, historically used for specifying an initial MPU rate at boot, no longer has any effect due to the supporting code being removed as it was 'wrong and dangerous' [1].

This patch removes the remaining dead code associated with the __setup macros to avoid confusion and reduce bloat.

[1] https://patchwork.kernel.org/patch/5954631/

Signed-off-by Andrew Murray <[email protected]>

---
 arch/arm/mach-omap1/clock.c | 20 --------------------
 arch/arm/mach-omap1/clock.h |  2 --
 arch/arm/mach-omap2/clock.c | 20 --------------------
 3 files changed, 42 deletions(-)

arch/arm/mach-omap1/clock.c +0 -20

index 4f5fd4a..43e3e18 100644
@@ -720,26 +720,6 @@ EXPORT_SYMBOL(clk_get_parent);
  * OMAP specific clock functions shared between omap1 and omap2
  */
 
-int __initdata mpurate;
-
-/*
- * By default we use the rate set by the bootloader.
- * You can override this with mpurate= cmdline option.
- */
-static int __init omap_clk_setup(char *str)
-{
-	get_option(&str, &mpurate);
-
-	if (!mpurate)
-		return 1;
-
-	if (mpurate < 1000)
-		mpurate *= 1000000;
-
-	return 1;
-}
-__setup("mpurate=", omap_clk_setup);
-
 /* Used for clocks that always have same value as the parent clock */
 unsigned long followparent_recalc(struct clk *clk)
 {

arch/arm/mach-omap1/clock.h +0 -2

index 1e4918a..f2d1be2 100644
@@ -173,8 +173,6 @@ struct clk_functions {
 	void		(*clk_disable_unused)(struct clk *clk);
 };
 
-extern int mpurate;
-
 extern int clk_init(struct clk_functions *custom_clocks);
 extern void clk_preinit(struct clk *clk);
 extern int clk_register(struct clk *clk);

arch/arm/mach-omap2/clock.c +0 -20

index d058125..d999295 100644
@@ -112,26 +112,6 @@ void omap2_init_clk_clkdm(struct clk_hw *hw)
 	}
 }
 
-static int __initdata mpurate;
-
-/*
- * By default we use the rate set by the bootloader.
- * You can override this with mpurate= cmdline option.
- */
-static int __init omap_clk_setup(char *str)
-{
-	get_option(&str, &mpurate);
-
-	if (!mpurate)
-		return 1;
-
-	if (mpurate < 1000)
-		mpurate *= 1000000;
-
-	return 1;
-}
-__setup("mpurate=", omap_clk_setup);
-
 /**
  * omap2_clk_print_new_rates - print summary of current clock tree rates
  * @hfclkin_ck_name: clk name for the off-chip HF oscillator

Signature · 6 lines

2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Quoted 4 lines · Andrew Murray

The 'mpurate' option, historically used for specifying an initial MPU rate at boot, no longer has any effect due to the supporting code being removed as it was 'wrong and dangerous' [1].

Quoted 4 lines

This patch removes the remaining dead code associated with the __setup macros to avoid confusion and reduce bloat.

[1] https://patchwork.kernel.org/patch/5954631/

Yeah AFAIK this is unused for mach-omap2. Adding Aaro to Cc for mach-omap1 in case there might be issues with this patch.

Quoted 87 lines

Signed-off-by Andrew Murray <[email protected]>

---
 arch/arm/mach-omap1/clock.c | 20 --------------------
 arch/arm/mach-omap1/clock.h |  2 --
 arch/arm/mach-omap2/clock.c | 20 --------------------
 3 files changed, 42 deletions(-)

arch/arm/mach-omap1/clock.c +0 -20

index 4f5fd4a..43e3e18 100644
@@ -720,26 +720,6 @@ EXPORT_SYMBOL(clk_get_parent);
  * OMAP specific clock functions shared between omap1 and omap2
  */
 
-int __initdata mpurate;
-
-/*
- * By default we use the rate set by the bootloader.
- * You can override this with mpurate= cmdline option.
- */
-static int __init omap_clk_setup(char *str)
-{
-     get_option(&str, &mpurate);
-
-     if (!mpurate)
-             return 1;
-
-     if (mpurate < 1000)
-             mpurate *= 1000000;
-
-     return 1;
-}
-__setup("mpurate=", omap_clk_setup);
-
 /* Used for clocks that always have same value as the parent clock */
 unsigned long followparent_recalc(struct clk *clk)
 {

arch/arm/mach-omap1/clock.h +0 -2

index 1e4918a..f2d1be2 100644
@@ -173,8 +173,6 @@ struct clk_functions {
      void            (*clk_disable_unused)(struct clk *clk);
 };
 
-extern int mpurate;
-
 extern int clk_init(struct clk_functions *custom_clocks);
 extern void clk_preinit(struct clk *clk);
 extern int clk_register(struct clk *clk);

arch/arm/mach-omap2/clock.c +0 -21

index d058125..d999295 100644
@@ -112,26 +112,6 @@ void omap2_init_clk_clkdm(struct clk_hw *hw)
      }
 }
 
-static int __initdata mpurate;
-
-/*
- * By default we use the rate set by the bootloader.
- * You can override this with mpurate= cmdline option.
- */
-static int __init omap_clk_setup(char *str)
-{
-     get_option(&str, &mpurate);
-
-     if (!mpurate)
-             return 1;
-
-     if (mpurate < 1000)
-             mpurate *= 1000000;
-
-     return 1;
-}
-__setup("mpurate=", omap_clk_setup);
-
 /**
  * omap2_clk_print_new_rates - print summary of current clock tree rates
  * @hfclkin_ck_name: clk name for the off-chip HF oscillator
--

2.5.0

Quoted 5 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 5 lines · Tony Lindgren

Quoted 4 lines · Andrew Murray

The 'mpurate' option, historically used for specifying an initial MPU rate at boot, no longer has any effect due to the supporting code being removed as it was 'wrong and dangerous' [1].

Quoted 8 lines

Quoted 4 lines

This patch removes the remaining dead code associated with the __setup macros to avoid confusion and reduce bloat.

[1] https://patchwork.kernel.org/patch/5954631/

Yeah AFAIK this is unused for mach-omap2. Adding Aaro to Cc for mach-omap1 in case there might be issues with this patch.

I've also noticed that omap2_clk_print_new_rates in arch/arm/mach-omap2/clock.c is also unused - this was previously used to print the new clock rates upon change after use of mpurate.

I'll update the patch to include the removal of this function as well
- unless you have any objections.