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

Commit 60d0ec2e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qcom: msm-pm: move cpu status driver register to arch_initcall"

parents 08163ac8 ff5e29a6

drivers/power/qcom/msm-pm.c

+9 −2
Original line number Original line Diff line number Diff line
@@ -959,7 +959,14 @@ static int __init msm_pm_drv_init(void) 
}

}

late_initcall(msm_pm_drv_init);

late_initcall(msm_pm_drv_init);





void __init msm_pm_sleep_status_init(void)

int __init msm_pm_sleep_status_init(void)

{

{

	platform_driver_register(&msm_cpu_status_driver);

	static bool registered;



	if (registered)

		return 0;

	registered = true;



	return platform_driver_register(&msm_cpu_status_driver);

}

}

arch_initcall(msm_pm_sleep_status_init);

include/soc/qcom/pm.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -103,14 +103,14 @@ int msm_pm_collapse(unsigned long unused); 
#ifdef CONFIG_MSM_PM

#ifdef CONFIG_MSM_PM

void msm_pm_set_rpm_wakeup_irq(unsigned int irq);

void msm_pm_set_rpm_wakeup_irq(unsigned int irq);

int msm_pm_wait_cpu_shutdown(unsigned int cpu);

int msm_pm_wait_cpu_shutdown(unsigned int cpu);

void __init msm_pm_sleep_status_init(void);

int __init msm_pm_sleep_status_init(void);

void msm_pm_set_l2_flush_flag(enum msm_pm_l2_scm_flag flag);

void msm_pm_set_l2_flush_flag(enum msm_pm_l2_scm_flag flag);

void lpm_cpu_hotplug_enter(unsigned int cpu);

void lpm_cpu_hotplug_enter(unsigned int cpu);

s32 msm_cpuidle_get_deep_idle_latency(void);

s32 msm_cpuidle_get_deep_idle_latency(void);

#else

#else

static inline void msm_pm_set_rpm_wakeup_irq(unsigned int irq) {}

static inline void msm_pm_set_rpm_wakeup_irq(unsigned int irq) {}

static inline int msm_pm_wait_cpu_shutdown(unsigned int cpu) { return 0; }

static inline int msm_pm_wait_cpu_shutdown(unsigned int cpu) { return 0; }

static inline void msm_pm_sleep_status_init(void) {};

static inline int msm_pm_sleep_status_init(void) { return 0; };

static inline void msm_pm_set_l2_flush_flag(unsigned int flag) { }

static inline void msm_pm_set_l2_flush_flag(unsigned int flag) { }

static inline void lpm_cpu_hotplug_enter(unsigned int cpu) {};

static inline void lpm_cpu_hotplug_enter(unsigned int cpu) {};

static inline s32 msm_cpuidle_get_deep_idle_latency(void) { return 0; }

static inline s32 msm_cpuidle_get_deep_idle_latency(void) { return 0; }