leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge back earlier cpufreq material for v4.9.

Browse Source
This commit is contained in:
Rafael J. Wysocki 2016-09-12 14:49:29 +02:00
commit d0fbf1d328
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/cpufreq/cpufreq-dt-platdev.c
View File

@ -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

4
drivers/cpufreq/cpufreq.c
View File

@ -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;

1
drivers/cpufreq/scpi-cpufreq.c
View File

@ -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,