Commit 4c1cfab1 authored by Adrian Bunk's avatar Adrian Bunk Committed by Paul Mundt
Browse files

sh/kernel/ cleanups 



This patch contains the following cleanups:
- make the following needlessly global code static:
  - cf-enabler.c: cf_init()
  - cpu/clock.c: __clk_enable()
  - cpu/clock.c: __clk_disable()
  - process_32.c: default_idle()
  - time_32.c: struct clocksource_sh
  - timers/timer-tmu.c: struct tmu_timer_ops
- remove the following unused functions (no CONFIG_BLK_DEV_FD on sh):
  - process_{32,64}.c: disable_hlt()
  - process_{32,64}.c: enable_hlt()

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 62410034

arch/sh/kernel/cf-enabler.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int __init cf_init_se(void) 
}

#endif



int __init cf_init(void)

static int __init cf_init(void)

{

	if (mach_is_se() || mach_is_7722se() || mach_is_7721se())

		return cf_init_se();

arch/sh/kernel/cpu/clock.c

+2 −4
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static void propagate_rate(struct clk *clk) 
	}

}



int __clk_enable(struct clk *clk)

static int __clk_enable(struct clk *clk)

{

	/*

	 * See if this is the first time we're enabling the clock, some
@@ -111,7 +111,6 @@ int __clk_enable(struct clk *clk) 


	return 0;

}

EXPORT_SYMBOL_GPL(__clk_enable);



int clk_enable(struct clk *clk)

{
@@ -131,7 +130,7 @@ static void clk_kref_release(struct kref *kref) 
	/* Nothing to do */

}



void __clk_disable(struct clk *clk)

static void __clk_disable(struct clk *clk)

{

	int count = kref_put(&clk->kref, clk_kref_release);
@@ -143,7 +142,6 @@ void __clk_disable(struct clk *clk) 
			clk->ops->disable(clk);

	}

}

EXPORT_SYMBOL_GPL(__clk_disable);



void clk_disable(struct clk *clk)

{

arch/sh/kernel/process_32.c

+1 −13
Original line number Diff line number Diff line
@@ -34,18 +34,6 @@ void (*pm_idle)(void); 
void (*pm_power_off)(void);

EXPORT_SYMBOL(pm_power_off);



void disable_hlt(void)

{

	hlt_counter++;

}

EXPORT_SYMBOL(disable_hlt);



void enable_hlt(void)

{

	hlt_counter--;

}

EXPORT_SYMBOL(enable_hlt);



static int __init nohlt_setup(char *__unused)

{

	hlt_counter = 1;
@@ -60,7 +48,7 @@ static int __init hlt_setup(char *__unused) 
}

__setup("hlt", hlt_setup);



void default_idle(void)

static void default_idle(void)

{

	if (!hlt_counter) {

		clear_thread_flag(TIF_POLLING_NRFLAG);

arch/sh/kernel/process_64.c

+0 −10
Original line number Diff line number Diff line
@@ -36,16 +36,6 @@ static int hlt_counter = 1; 


#define HARD_IDLE_TIMEOUT (HZ / 3)



void disable_hlt(void)

{

	hlt_counter++;

}



void enable_hlt(void)

{

	hlt_counter--;

}



static int __init nohlt_setup(char *__unused)

{

	hlt_counter = 1;

arch/sh/kernel/time_32.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ unsigned long sh_hpt_frequency = 0; 


#define NSEC_PER_CYC_SHIFT	10



struct clocksource clocksource_sh = {

static struct clocksource clocksource_sh = {

	.name		= "SuperH",

	.rating		= 200,

	.mask		= CLOCKSOURCE_MASK(32),

CRA Git | Maintained and supported by SUSTech CRA and CCSE