Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1618a7a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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()
parents ee42f75d 75d6137d

arch/sh/kernel/cpu/shmobile/cpuidle.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

}

drivers/cpuidle/cpuidle-calxeda.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

drivers/cpuidle/cpuidle-kirkwood.c

+1 −1
Original line number Diff line number Diff line
@@ -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;