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

Merge back earlier cpufreq material for v4.9.

parents 3732b30a 3689ad7e
...@@ -40,6 +40,7 @@ static const struct of_device_id machines[] __initconst = { ...@@ -40,6 +40,7 @@ static const struct of_device_id machines[] __initconst = {
{ .compatible = "samsung,exynos5250", }, { .compatible = "samsung,exynos5250", },
#ifndef CONFIG_BL_SWITCHER #ifndef CONFIG_BL_SWITCHER
{ .compatible = "samsung,exynos5420", }, { .compatible = "samsung,exynos5420", },
{ .compatible = "samsung,exynos5433", },
{ .compatible = "samsung,exynos5800", }, { .compatible = "samsung,exynos5800", },
#endif #endif
......
...@@ -1073,13 +1073,9 @@ static void handle_update(struct work_struct *work) ...@@ -1073,13 +1073,9 @@ static void handle_update(struct work_struct *work)
static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu)
{ {
struct device *dev = get_cpu_device(cpu);
struct cpufreq_policy *policy; struct cpufreq_policy *policy;
int ret; int ret;
if (WARN_ON(!dev))
return NULL;
policy = kzalloc(sizeof(*policy), GFP_KERNEL); policy = kzalloc(sizeof(*policy), GFP_KERNEL);
if (!policy) if (!policy)
return NULL; return NULL;
......
...@@ -105,7 +105,6 @@ static int scpi_cpufreq_remove(struct platform_device *pdev) ...@@ -105,7 +105,6 @@ static int scpi_cpufreq_remove(struct platform_device *pdev)
static struct platform_driver scpi_cpufreq_platdrv = { static struct platform_driver scpi_cpufreq_platdrv = {
.driver = { .driver = {
.name = "scpi-cpufreq", .name = "scpi-cpufreq",
.owner = THIS_MODULE,
}, },
.probe = scpi_cpufreq_probe, .probe = scpi_cpufreq_probe,
.remove = scpi_cpufreq_remove, .remove = scpi_cpufreq_remove,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment