diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-05 11:07:28 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-05 11:07:28 +0000 |
| commit | 598bcc6ea6ec4032d2ace8b1b43d11b4708af072 (patch) | |
| tree | 675a2b01617549b539a4dcb1aec7141798e1f324 /drivers/soc | |
| parent | 0bed4b7aa02c06e05121875dc443295d55b9d91d (diff) | |
| parent | e679660dbb8347f275fe5d83a5dd59c1fb6c8e63 (diff) | |
| download | linux-598bcc6ea6ec4032d2ace8b1b43d11b4708af072.tar.gz | |
Merge branches 'misc' and 'misc-rc6' into for-linus
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/spm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/soc/qcom/spm.c b/drivers/soc/qcom/spm.c index b04b05a0904e..0ad66fa9bb1a 100644 --- a/drivers/soc/qcom/spm.c +++ b/drivers/soc/qcom/spm.c @@ -116,7 +116,7 @@ static const struct spm_reg_data spm_reg_8064_cpu = { static DEFINE_PER_CPU(struct spm_driver_data *, cpu_spm_drv); -typedef int (*idle_fn)(int); +typedef int (*idle_fn)(void); static DEFINE_PER_CPU(idle_fn*, qcom_idle_ops); static inline void spm_register_write(struct spm_driver_data *drv, @@ -179,10 +179,10 @@ static int qcom_pm_collapse(unsigned long int unused) return -1; } -static int qcom_cpu_spc(int cpu) +static int qcom_cpu_spc(void) { int ret; - struct spm_driver_data *drv = per_cpu(cpu_spm_drv, cpu); + struct spm_driver_data *drv = __this_cpu_read(cpu_spm_drv); spm_set_low_power_mode(drv, PM_SLEEP_MODE_SPC); ret = cpu_suspend(0, qcom_pm_collapse); @@ -197,9 +197,9 @@ static int qcom_cpu_spc(int cpu) return ret; } -static int qcom_idle_enter(int cpu, unsigned long index) +static int qcom_idle_enter(unsigned long index) { - return per_cpu(qcom_idle_ops, cpu)[index](cpu); + return __this_cpu_read(qcom_idle_ops)[index](); } static const struct of_device_id qcom_idle_state_match[] __initconst = { |