Input: elantech - trust firmware about trackpoint presence

[cascardo/linux.git] / drivers / cpufreq / integrator-cpufreq.c

diff --git a/drivers/cpufreq/integrator-cpufreq.c b/drivers/cpufreq/integrator-cpufreq.c
index e5122f1..6bd69ad 100644 (file)
--- a/drivers/cpufreq/integrator-cpufreq.c
+++ b/drivers/cpufreq/integrator-cpufreq.c
@@ -92,7 +92,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,
         * Bind to the specified CPU.  When this call returns,
         * we should be running on the right CPU.
         */
-       set_cpus_allowed(current, cpumask_of_cpu(cpu));
+       set_cpus_allowed_ptr(current, cpumask_of(cpu));
        BUG_ON(cpu != smp_processor_id());
 
        /* get current setting */
@@ -118,7 +118,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,
        freqs.new = icst_hz(&cclk_params, vco) / 1000;
 
        if (freqs.old == freqs.new) {
-               set_cpus_allowed(current, cpus_allowed);
+               set_cpus_allowed_ptr(current, &cpus_allowed);
                return 0;
        }
 
@@ -141,7 +141,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,
        /*
         * Restore the CPUs allowed mask.
         */
-       set_cpus_allowed(current, cpus_allowed);
+       set_cpus_allowed_ptr(current, &cpus_allowed);
 
        cpufreq_freq_transition_end(policy, &freqs, 0);
 
@@ -157,7 +157,7 @@ static unsigned int integrator_get(unsigned int cpu)
 
        cpus_allowed = current->cpus_allowed;
 
-       set_cpus_allowed(current, cpumask_of_cpu(cpu));
+       set_cpus_allowed_ptr(current, cpumask_of(cpu));
        BUG_ON(cpu != smp_processor_id());
 
        /* detect memory etc. */
@@ -173,7 +173,7 @@ static unsigned int integrator_get(unsigned int cpu)
 
        current_freq = icst_hz(&cclk_params, vco) / 1000; /* current freq */
 
-       set_cpus_allowed(current, cpus_allowed);
+       set_cpus_allowed_ptr(current, &cpus_allowed);
 
        return current_freq;
 }
@@ -213,9 +213,9 @@ static int __init integrator_cpufreq_probe(struct platform_device *pdev)
        return cpufreq_register_driver(&integrator_driver);
 }
 
-static void __exit integrator_cpufreq_remove(struct platform_device *pdev)
+static int __exit integrator_cpufreq_remove(struct platform_device *pdev)
 {
-       cpufreq_unregister_driver(&integrator_driver);
+       return cpufreq_unregister_driver(&integrator_driver);
 }
 
 static const struct of_device_id integrator_cpufreq_match[] = {