Commit 9b961aa9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpufreq' and 'acpi-thermal' 

* pm-cpufreq:
  cpufreq: cpu0: drop wrong devm usage
  cpufreq: remove race while accessing cur_policy

* acpi-thermal:
  ACPI / thermal: fix workqueue destroy order
parents c7208164 e3beb0ac 2807bd18

drivers/acpi/thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -1278,8 +1278,8 @@ static int __init acpi_thermal_init(void) 


static void __exit acpi_thermal_exit(void)

{

	destroy_workqueue(acpi_thermal_pm_queue);

	acpi_bus_unregister_driver(&acpi_thermal_driver);

	destroy_workqueue(acpi_thermal_pm_queue);



	return;

}

drivers/cpufreq/cpufreq-cpu0.c

+11 −5
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) 
		return -ENOENT;

	}



	cpu_reg = devm_regulator_get_optional(cpu_dev, "cpu0");

	cpu_reg = regulator_get_optional(cpu_dev, "cpu0");

	if (IS_ERR(cpu_reg)) {

		/*

		 * If cpu0 regulator supply node is present, but regulator is
@@ -145,23 +145,23 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) 
			PTR_ERR(cpu_reg));

	}



	cpu_clk = devm_clk_get(cpu_dev, NULL);

	cpu_clk = clk_get(cpu_dev, NULL);

	if (IS_ERR(cpu_clk)) {

		ret = PTR_ERR(cpu_clk);

		pr_err("failed to get cpu0 clock: %d\n", ret);

		goto out_put_node;

		goto out_put_reg;

	}



	ret = of_init_opp_table(cpu_dev);

	if (ret) {

		pr_err("failed to init OPP table: %d\n", ret);

		goto out_put_node;

		goto out_put_clk;

	}



	ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table);

	if (ret) {

		pr_err("failed to init cpufreq table: %d\n", ret);

		goto out_put_node;

		goto out_put_clk;

	}



	of_property_read_u32(np, "voltage-tolerance", &voltage_tolerance);
@@ -216,6 +216,12 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev) 


out_free_table:

	dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);

out_put_clk:

	if (!IS_ERR(cpu_clk))

		clk_put(cpu_clk);

out_put_reg:

	if (!IS_ERR(cpu_reg))

		regulator_put(cpu_reg);

out_put_node:

	of_node_put(np);

	return ret;

drivers/cpufreq/cpufreq_governor.c

+6 −0
Original line number Diff line number Diff line
@@ -366,6 +366,11 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, 
		break;



	case CPUFREQ_GOV_LIMITS:

		mutex_lock(&dbs_data->mutex);

		if (!cpu_cdbs->cur_policy) {

			mutex_unlock(&dbs_data->mutex);

			break;

		}

		mutex_lock(&cpu_cdbs->timer_mutex);

		if (policy->max < cpu_cdbs->cur_policy->cur)

			__cpufreq_driver_target(cpu_cdbs->cur_policy,
@@ -375,6 +380,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, 
					policy->min, CPUFREQ_RELATION_L);

		dbs_check_cpu(dbs_data, cpu);

		mutex_unlock(&cpu_cdbs->timer_mutex);

		mutex_unlock(&dbs_data->mutex);

		break;

	}

	return 0;