diff options
| -rw-r--r-- | arch/arm/kernel/cpuidle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c index 703926e7007b..a44b268e12e1 100644 --- a/arch/arm/kernel/cpuidle.c +++ b/arch/arm/kernel/cpuidle.c | |||
| @@ -70,7 +70,7 @@ int arm_cpuidle_suspend(int index) | |||
| 70 | * | 70 | * |
| 71 | * Returns a struct cpuidle_ops pointer, NULL if not found. | 71 | * Returns a struct cpuidle_ops pointer, NULL if not found. |
| 72 | */ | 72 | */ |
| 73 | static struct cpuidle_ops *__init arm_cpuidle_get_ops(const char *method) | 73 | static const struct cpuidle_ops *__init arm_cpuidle_get_ops(const char *method) |
| 74 | { | 74 | { |
| 75 | struct of_cpuidle_method *m = __cpuidle_method_of_table; | 75 | struct of_cpuidle_method *m = __cpuidle_method_of_table; |
| 76 | 76 | ||
| @@ -88,7 +88,7 @@ static struct cpuidle_ops *__init arm_cpuidle_get_ops(const char *method) | |||
| 88 | * | 88 | * |
| 89 | * Get the method name defined in the 'enable-method' property, retrieve the | 89 | * Get the method name defined in the 'enable-method' property, retrieve the |
| 90 | * associated cpuidle_ops and do a struct copy. This copy is needed because all | 90 | * associated cpuidle_ops and do a struct copy. This copy is needed because all |
| 91 | * cpuidle_ops are tagged __initdata and will be unloaded after the init | 91 | * cpuidle_ops are tagged __initconst and will be unloaded after the init |
| 92 | * process. | 92 | * process. |
| 93 | * | 93 | * |
| 94 | * Return 0 on sucess, -ENOENT if no 'enable-method' is defined, -EOPNOTSUPP if | 94 | * Return 0 on sucess, -ENOENT if no 'enable-method' is defined, -EOPNOTSUPP if |
| @@ -97,7 +97,7 @@ static struct cpuidle_ops *__init arm_cpuidle_get_ops(const char *method) | |||
| 97 | static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu) | 97 | static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu) |
| 98 | { | 98 | { |
| 99 | const char *enable_method; | 99 | const char *enable_method; |
| 100 | struct cpuidle_ops *ops; | 100 | const struct cpuidle_ops *ops; |
| 101 | 101 | ||
| 102 | enable_method = of_get_property(dn, "enable-method", NULL); | 102 | enable_method = of_get_property(dn, "enable-method", NULL); |
| 103 | if (!enable_method) | 103 | if (!enable_method) |
