Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-rafael' of... 

Merge branch 'for-rafael' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq into pm-devfreq

Pull devfreq fixes from MyungJoo Ham.

* 'for-rafael' of git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: create_freezable_workqueue() doesn't return an ERR_PTR
  PM / devfreq: Remove duplicate header file inclusion in exynos5_bus.c
  PM / devfreq: Use devm_* APIs in exynos5_bus.c
  PM / devfreq: Remove redundant platform_set_drvdata() in exynos5_bus.c
  PM / devfreq: Fix incorrect usage of IS_ERR_OR_NULL in exynos5_bus.c
parents 959f5854 ea7f4548

drivers/devfreq/devfreq.c

+2 −2
Original line number Diff line number Diff line
@@ -993,10 +993,10 @@ static int __init devfreq_init(void) 
	}



	devfreq_wq = create_freezable_workqueue("devfreq_wq");

	if (IS_ERR(devfreq_wq)) {

	if (!devfreq_wq) {

		class_destroy(devfreq_class);

		pr_err("%s: couldn't create workqueue\n", __FILE__);

		return PTR_ERR(devfreq_wq);

		return -ENOMEM;

	}

	devfreq_class->dev_groups = devfreq_groups;

drivers/devfreq/exynos/exynos5_bus.c

+9 −22
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/opp.h>

#include <linux/slab.h>

#include <linux/suspend.h>

#include <linux/opp.h>

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/platform_device.h>
@@ -351,20 +350,18 @@ static int exynos5_busfreq_int_probe(struct platform_device *pdev) 


	err = exynos5250_init_int_tables(data);

	if (err)

		goto err_regulator;

		return err;



	data->vdd_int = regulator_get(dev, "vdd_int");

	data->vdd_int = devm_regulator_get(dev, "vdd_int");

	if (IS_ERR(data->vdd_int)) {

		dev_err(dev, "Cannot get the regulator \"vdd_int\"\n");

		err = PTR_ERR(data->vdd_int);

		goto err_regulator;

		return PTR_ERR(data->vdd_int);

	}



	data->int_clk = clk_get(dev, "int_clk");

	data->int_clk = devm_clk_get(dev, "int_clk");

	if (IS_ERR(data->int_clk)) {

		dev_err(dev, "Cannot get clock \"int_clk\"\n");

		err = PTR_ERR(data->int_clk);

		goto err_clock;

		return PTR_ERR(data->int_clk);

	}



	rcu_read_lock();
@@ -374,8 +371,7 @@ static int exynos5_busfreq_int_probe(struct platform_device *pdev) 
		rcu_read_unlock();

		dev_err(dev, "Invalid initial frequency %lu kHz.\n",

		       exynos5_devfreq_int_profile.initial_freq);

		err = PTR_ERR(opp);

		goto err_opp_add;

		return PTR_ERR(opp);

	}

	initial_freq = opp_get_freq(opp);

	initial_volt = opp_get_voltage(opp);
@@ -385,12 +381,12 @@ static int exynos5_busfreq_int_probe(struct platform_device *pdev) 
	err = clk_set_rate(data->int_clk, initial_freq * 1000);

	if (err) {

		dev_err(dev, "Failed to set initial frequency\n");

		goto err_opp_add;

		return err;

	}



	err = exynos5_int_setvolt(data, initial_volt);

	if (err)

		goto err_opp_add;

		return err;



	platform_set_drvdata(pdev, data);
@@ -419,12 +415,6 @@ static int exynos5_busfreq_int_probe(struct platform_device *pdev) 


err_devfreq_add:

	devfreq_remove_device(data->devfreq);

	platform_set_drvdata(pdev, NULL);

err_opp_add:

	clk_put(data->int_clk);

err_clock:

	regulator_put(data->vdd_int);

err_regulator:

	return err;

}
@@ -435,9 +425,6 @@ static int exynos5_busfreq_int_remove(struct platform_device *pdev) 
	pm_qos_remove_request(&data->int_req);

	unregister_pm_notifier(&data->pm_notifier);

	devfreq_remove_device(data->devfreq);

	regulator_put(data->vdd_int);

	clk_put(data->int_clk);

	platform_set_drvdata(pdev, NULL);



	return 0;

}
@@ -479,7 +466,7 @@ static int __init exynos5_busfreq_int_init(void) 


	exynos5_devfreq_pdev =

		platform_device_register_simple("exynos5-bus-int", -1, NULL, 0);

	if (IS_ERR_OR_NULL(exynos5_devfreq_pdev)) {

	if (IS_ERR(exynos5_devfreq_pdev)) {

		ret = PTR_ERR(exynos5_devfreq_pdev);

		goto out1;

	}