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

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

Merge "msm: cpuidle: Remove cpuidle header file"

parents ba7b5027 77586775

arch/arm/mach-msm/include/mach/cpuidle.h

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2011, 2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#ifndef __ARCH_ARM_MACH_MSM_CPUIDLE_H

#define __ARCH_ARM_MACH_MSM_CPUIDLE_H



#include <linux/notifier.h>

#include <soc/qcom/pm.h>



struct msm_cpuidle_state {

	int state_nr;

	char *name;

	char *desc;

	enum msm_pm_sleep_mode mode_nr;

};



#ifdef CONFIG_MSM_PM

s32 msm_cpuidle_get_deep_idle_latency(void);

#else

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

#endif



#ifdef CONFIG_CPU_IDLE

int msm_cpuidle_init(void);

#else

static inline int msm_cpuidle_init(void) { return -ENOSYS; }

#endif



#endif /* __ARCH_ARM_MACH_MSM_CPUIDLE_H */

arch/arm/mach-msm/lpm_levels.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <soc/qcom/pm.h>

#include <soc/qcom/rpm-notifier.h>

#include <soc/qcom/event_timer.h>

#include <mach/cpuidle.h>



#define SCLK_HZ (32768)

arch/arm/mach-msm/no-pm.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#include <linux/module.h>

#include <asm/proc-fns.h>

#include <mach/cpuidle.h>

#include <soc/qcom/pm.h>



void arch_idle(void)

drivers/mfd/wcd9xxx-irq.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/of_irq.h>

#include <linux/slab.h>

#include <linux/ratelimit.h>

#include <mach/cpuidle.h>

#include <soc/qcom/pm.h>



#define BYTE_BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_BYTE))

#define BIT_BYTE(nr)			((nr) / BITS_PER_BYTE)

include/soc/qcom/pm.h

+4 −9
Original line number Diff line number Diff line
@@ -105,11 +105,6 @@ struct msm_pm_cpr_ops { 
	void (*cpr_resume)(void);

};



struct msm_cpuidle_state;



enum msm_pm_sleep_mode msm_pm_idle_enter(struct cpuidle_device *dev,

			struct cpuidle_driver *drv, int index,

			const struct msm_cpuidle_state *states);

void __init msm_pm_set_tz_retention_flag(unsigned int flag);

void msm_pm_enable_retention(bool enable);

bool msm_pm_retention_enabled(void);
@@ -121,16 +116,16 @@ int msm_pm_wait_cpu_shutdown(unsigned int cpu); 
void __init msm_pm_sleep_status_init(void);

void msm_pm_set_l2_flush_flag(enum msm_pm_l2_scm_flag flag);

void lpm_cpu_hotplug_enter(unsigned int cpu);

s32 msm_cpuidle_get_deep_idle_latency(void);

#else

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 void msm_pm_sleep_status_init(void) {};

static inline void msm_pm_set_l2_flush_flag(unsigned int flag)

{

	/* empty */

}

static inline void msm_pm_set_l2_flush_flag(unsigned int flag) { }

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

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

#endif



#ifdef CONFIG_HOTPLUG_CPU

int msm_platform_secondary_init(unsigned int cpu);

#else