diff options
author | Anton Blanchard <anton@samba.org> | 2010-05-16 16:01:28 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-21 03:31:11 -0400 |
commit | dd04c63c96425af9b6741f3abf0ad25d6b1c0e8d (patch) | |
tree | c34eb68c389818362bfa90cada33b35b68c62450 /arch/powerpc/kernel | |
parent | 60adec6226bbcf061d4c2d10944fced209d1847d (diff) |
powerpc: Remove check of ibm,smt-snooze-delay OF property
I'm not sure why we have code for parsing an ibm,smt-snooze-delay OF
property. Since we have a smt-snooze-delay= boot option and we can
also set it at runtime via sysfs, it should be safe to get rid of
this code.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/sysfs.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index e235e52dc4fe..158fb731e199 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c | |||
@@ -67,33 +67,6 @@ static ssize_t show_smt_snooze_delay(struct sys_device *dev, | |||
67 | static SYSDEV_ATTR(smt_snooze_delay, 0644, show_smt_snooze_delay, | 67 | static SYSDEV_ATTR(smt_snooze_delay, 0644, show_smt_snooze_delay, |
68 | store_smt_snooze_delay); | 68 | store_smt_snooze_delay); |
69 | 69 | ||
70 | /* Only parse OF options if the matching cmdline option was not specified */ | ||
71 | static int smt_snooze_cmdline; | ||
72 | |||
73 | static int __init smt_setup(void) | ||
74 | { | ||
75 | struct device_node *options; | ||
76 | const unsigned int *val; | ||
77 | unsigned int cpu; | ||
78 | |||
79 | if (!cpu_has_feature(CPU_FTR_SMT)) | ||
80 | return -ENODEV; | ||
81 | |||
82 | options = of_find_node_by_path("/options"); | ||
83 | if (!options) | ||
84 | return -ENODEV; | ||
85 | |||
86 | val = of_get_property(options, "ibm,smt-snooze-delay", NULL); | ||
87 | if (!smt_snooze_cmdline && val) { | ||
88 | for_each_possible_cpu(cpu) | ||
89 | per_cpu(smt_snooze_delay, cpu) = *val; | ||
90 | } | ||
91 | |||
92 | of_node_put(options); | ||
93 | return 0; | ||
94 | } | ||
95 | __initcall(smt_setup); | ||
96 | |||
97 | static int __init setup_smt_snooze_delay(char *str) | 70 | static int __init setup_smt_snooze_delay(char *str) |
98 | { | 71 | { |
99 | unsigned int cpu; | 72 | unsigned int cpu; |
@@ -102,8 +75,6 @@ static int __init setup_smt_snooze_delay(char *str) | |||
102 | if (!cpu_has_feature(CPU_FTR_SMT)) | 75 | if (!cpu_has_feature(CPU_FTR_SMT)) |
103 | return 1; | 76 | return 1; |
104 | 77 | ||
105 | smt_snooze_cmdline = 1; | ||
106 | |||
107 | if (get_option(&str, &snooze)) { | 78 | if (get_option(&str, &snooze)) { |
108 | for_each_possible_cpu(cpu) | 79 | for_each_possible_cpu(cpu) |
109 | per_cpu(smt_snooze_delay, cpu) = snooze; | 80 | per_cpu(smt_snooze_delay, cpu) = snooze; |