powerpc: Remove check of ibm,smt-snooze-delay OF property
authorAnton Blanchard <anton@samba.org>
Sun, 16 May 2010 20:01:28 +0000 (20:01 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 21 May 2010 07:31:11 +0000 (17:31 +1000)
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>
arch/powerpc/kernel/sysfs.c

index e235e52..158fb73 100644 (file)
@@ -67,33 +67,6 @@ static ssize_t show_smt_snooze_delay(struct sys_device *dev,
 static SYSDEV_ATTR(smt_snooze_delay, 0644, show_smt_snooze_delay,
                   store_smt_snooze_delay);
 
-/* Only parse OF options if the matching cmdline option was not specified */
-static int smt_snooze_cmdline;
-
-static int __init smt_setup(void)
-{
-       struct device_node *options;
-       const unsigned int *val;
-       unsigned int cpu;
-
-       if (!cpu_has_feature(CPU_FTR_SMT))
-               return -ENODEV;
-
-       options = of_find_node_by_path("/options");
-       if (!options)
-               return -ENODEV;
-
-       val = of_get_property(options, "ibm,smt-snooze-delay", NULL);
-       if (!smt_snooze_cmdline && val) {
-               for_each_possible_cpu(cpu)
-                       per_cpu(smt_snooze_delay, cpu) = *val;
-       }
-
-       of_node_put(options);
-       return 0;
-}
-__initcall(smt_setup);
-
 static int __init setup_smt_snooze_delay(char *str)
 {
        unsigned int cpu;
@@ -102,8 +75,6 @@ static int __init setup_smt_snooze_delay(char *str)
        if (!cpu_has_feature(CPU_FTR_SMT))
                return 1;
 
-       smt_snooze_cmdline = 1;
-
        if (get_option(&str, &snooze)) {
                for_each_possible_cpu(cpu)
                        per_cpu(smt_snooze_delay, cpu) = snooze;