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

Merge back earlier cpufreq material for v4.9.

parents 3732b30a 3689ad7e

drivers/cpufreq/cpufreq-dt-platdev.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ static const struct of_device_id machines[] __initconst = { 
	{ .compatible = "samsung,exynos5250", },

#ifndef CONFIG_BL_SWITCHER

	{ .compatible = "samsung,exynos5420", },

	{ .compatible = "samsung,exynos5433", },

	{ .compatible = "samsung,exynos5800", },

#endif

drivers/cpufreq/cpufreq.c

+0 −4
Original line number Diff line number Diff line
@@ -1073,13 +1073,9 @@ static void handle_update(struct work_struct *work) 


static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu)

{

	struct device *dev = get_cpu_device(cpu);

	struct cpufreq_policy *policy;

	int ret;



	if (WARN_ON(!dev))

		return NULL;



	policy = kzalloc(sizeof(*policy), GFP_KERNEL);

	if (!policy)

		return NULL;

drivers/cpufreq/scpi-cpufreq.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static int scpi_cpufreq_remove(struct platform_device *pdev) 
static struct platform_driver scpi_cpufreq_platdrv = {

	.driver = {

		.name	= "scpi-cpufreq",

		.owner	= THIS_MODULE,

	},

	.probe		= scpi_cpufreq_probe,

	.remove		= scpi_cpufreq_remove,

CRA Git | Maintained and supported by SUSTech CRA and CCSE