mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-05 20:04:19 +08:00
Merge branch 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux into pm-cpuidle
Pull ARM cpuidle updates from Daniel Lezcano. * 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux: cpuidle: kirkwood: Make kirkwood_cpuidle_remove function static cpuidle: calxeda: Add missing __iomem annotation SH: cpuidle: Add missing parameter for cpuidle_register()
This commit is contained in:
commit
f1618a7a27
@ -91,13 +91,11 @@ static struct cpuidle_driver cpuidle_driver = {
|
||||
|
||||
int __init sh_mobile_setup_cpuidle(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (sh_mobile_sleep_supported & SUSP_SH_SF)
|
||||
cpuidle_driver.states[1].disabled = false;
|
||||
|
||||
if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
|
||||
cpuidle_driver.states[2].disabled = false;
|
||||
|
||||
return cpuidle_register(&cpuidle_driver);
|
||||
return cpuidle_register(&cpuidle_driver, NULL);
|
||||
}
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include <asm/cp15.h>
|
||||
|
||||
extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
|
||||
extern void *scu_base_addr;
|
||||
extern void __iomem *scu_base_addr;
|
||||
|
||||
static noinline void calxeda_idle_restore(void)
|
||||
{
|
||||
|
@ -70,7 +70,7 @@ static int kirkwood_cpuidle_probe(struct platform_device *pdev)
|
||||
return cpuidle_register(&kirkwood_idle_driver, NULL);
|
||||
}
|
||||
|
||||
int kirkwood_cpuidle_remove(struct platform_device *pdev)
|
||||
static int kirkwood_cpuidle_remove(struct platform_device *pdev)
|
||||
{
|
||||
cpuidle_unregister(&kirkwood_idle_driver);
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user