From: Adrian Bunk <bunk@xxxxxxxxx> This patch makes the following needlessly global code static: - driver.c: __cpuidle_find_driver() - governor.c: __cpuidle_find_governor() - ladder.c: struct ladder_governor Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Cc: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx> Cc: Adam Belay <abelay@xxxxxxxxxx> Cc: Shaohua Li <shaohua.li@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Len Brown <len.brown@xxxxxxxxx> --- drivers/cpuidle/cpuidle.h | 2 -- drivers/cpuidle/driver.c | 2 +- drivers/cpuidle/governor.c | 2 +- drivers/cpuidle/governors/ladder.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/cpuidle/cpuidle.h b/drivers/cpuidle/cpuidle.h index 2defa39..8bbc090 100644 --- a/drivers/cpuidle/cpuidle.h +++ b/drivers/cpuidle/cpuidle.h @@ -23,13 +23,11 @@ extern void cpuidle_rescan_device(struct cpuidle_device *dev); /* drivers */ extern int cpuidle_attach_driver(struct cpuidle_device *dev); extern void cpuidle_detach_driver(struct cpuidle_device *dev); -extern struct cpuidle_driver * __cpuidle_find_driver(const char *str); extern int cpuidle_switch_driver(struct cpuidle_driver *drv); /* governors */ extern int cpuidle_attach_governor(struct cpuidle_device *dev); extern void cpuidle_detach_governor(struct cpuidle_device *dev); -extern struct cpuidle_governor * __cpuidle_find_governor(const char *str); extern int cpuidle_switch_governor(struct cpuidle_governor *gov); /* sysfs */ diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index 1111279..de8c627 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -73,7 +73,7 @@ void cpuidle_detach_driver(struct cpuidle_device *dev) * * Must be called with cpuidle_lock aquired. */ -struct cpuidle_driver * __cpuidle_find_driver(const char *str) +static struct cpuidle_driver * __cpuidle_find_driver(const char *str) { struct cpuidle_driver *drv; diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c index b2d6a69..fa637fa 100644 --- a/drivers/cpuidle/governor.c +++ b/drivers/cpuidle/governor.c @@ -72,7 +72,7 @@ void cpuidle_detach_governor(struct cpuidle_device *dev) * * Must be called with cpuidle_lock aquired. */ -struct cpuidle_governor * __cpuidle_find_governor(const char *str) +static struct cpuidle_governor * __cpuidle_find_governor(const char *str) { struct cpuidle_governor *gov; diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c index d999393..87d2e54 100644 --- a/drivers/cpuidle/governors/ladder.c +++ b/drivers/cpuidle/governors/ladder.c @@ -199,7 +199,7 @@ static void ladder_exit_device(struct cpuidle_device *dev) kfree(dev->governor_data); } -struct cpuidle_governor ladder_governor = { +static struct cpuidle_governor ladder_governor = { .name = "ladder", .init = ladder_init_device, .exit = ladder_exit_device, -- 1.5.0.3.310.g05ef5 - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html