Merge back earlier cpufreq material for v4.9.

3 files changed, 1 insertions, 5 deletions

diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
index 2ee40fd360ca..285ed3e6494e 100644
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
@@ -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
 
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 3dd4884c6f9e..13fb589b6d2c 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -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;
diff --git a/drivers/cpufreq/scpi-cpufreq.c b/drivers/cpufreq/scpi-cpufreq.c
index e8a7bf57b31b..ea7a4e1b68c2 100644
--- a/drivers/cpufreq/scpi-cpufreq.c
+++ b/drivers/cpufreq/scpi-cpufreq.c
@@ -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,