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

Merge tag 'devfreq-next-for-6.12' of... 

Merge tag 'devfreq-next-for-6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux

Merge devfreq updates for v6.12 from Chanwoo Choi:

"Detailed description for this pull request:
 - Add missing MODULE_DESCRIPTION() macros for devfreq governors.
 - Use Use devm_clk_get_enabled() helpers for exyns-bus devfreq driver.
 - Use of_property_present() instead of of_get_property() for imx-bus
   devfreq driver."

* tag 'devfreq-next-for-6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux:
  PM / devfreq: imx-bus: Use of_property_present()
  PM / devfreq: exynos: Use Use devm_clk_get_enabled() helpers
  PM/devfreq: governor: add missing MODULE_DESCRIPTION() macros
parents da3ea350 d4755212

drivers/devfreq/exynos-bus.c

+5 −17
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ static void exynos_bus_exit(struct device *dev) 
	platform_device_unregister(bus->icc_pdev);



	dev_pm_opp_of_remove_table(dev);

	clk_disable_unprepare(bus->clk);

	dev_pm_opp_put_regulators(bus->opp_token);

}
@@ -171,7 +170,6 @@ static void exynos_bus_passive_exit(struct device *dev) 
	platform_device_unregister(bus->icc_pdev);



	dev_pm_opp_of_remove_table(dev);

	clk_disable_unprepare(bus->clk);

}



static int exynos_bus_parent_parse_of(struct device_node *np,
@@ -247,23 +245,16 @@ static int exynos_bus_parse_of(struct device_node *np, 
	int ret;



	/* Get the clock to provide each bus with source clock */

	bus->clk = devm_clk_get(dev, "bus");

	if (IS_ERR(bus->clk)) {

		dev_err(dev, "failed to get bus clock\n");

		return PTR_ERR(bus->clk);

	}



	ret = clk_prepare_enable(bus->clk);

	if (ret < 0) {

		dev_err(dev, "failed to get enable clock\n");

		return ret;

	}

	bus->clk = devm_clk_get_enabled(dev, "bus");

	if (IS_ERR(bus->clk))

		return dev_err_probe(dev, PTR_ERR(bus->clk),

				"failed to get bus clock\n");



	/* Get the freq and voltage from OPP table to scale the bus freq */

	ret = dev_pm_opp_of_add_table(dev);

	if (ret < 0) {

		dev_err(dev, "failed to get OPP table\n");

		goto err_clk;

		return ret;

	}



	rate = clk_get_rate(bus->clk);
@@ -281,8 +272,6 @@ static int exynos_bus_parse_of(struct device_node *np, 


err_opp:

	dev_pm_opp_of_remove_table(dev);

err_clk:

	clk_disable_unprepare(bus->clk);



	return ret;

}
@@ -453,7 +442,6 @@ static int exynos_bus_probe(struct platform_device *pdev) 


err:

	dev_pm_opp_of_remove_table(dev);

	clk_disable_unprepare(bus->clk);

err_reg:

	dev_pm_opp_put_regulators(bus->opp_token);

drivers/devfreq/governor_performance.c

+1 −0
Original line number Diff line number Diff line
@@ -58,4 +58,5 @@ static void __exit devfreq_performance_exit(void) 
	return;

}

module_exit(devfreq_performance_exit);

MODULE_DESCRIPTION("DEVFREQ Performance governor");

MODULE_LICENSE("GPL");

drivers/devfreq/governor_powersave.c

+1 −0
Original line number Diff line number Diff line
@@ -58,4 +58,5 @@ static void __exit devfreq_powersave_exit(void) 
	return;

}

module_exit(devfreq_powersave_exit);

MODULE_DESCRIPTION("DEVFREQ Powersave governor");

MODULE_LICENSE("GPL");

drivers/devfreq/governor_simpleondemand.c

+1 −0
Original line number Diff line number Diff line
@@ -140,4 +140,5 @@ static void __exit devfreq_simple_ondemand_exit(void) 
	return;

}

module_exit(devfreq_simple_ondemand_exit);

MODULE_DESCRIPTION("DEVFREQ Simple On-demand governor");

MODULE_LICENSE("GPL");

drivers/devfreq/governor_userspace.c

+1 −0
Original line number Diff line number Diff line
@@ -153,4 +153,5 @@ static void __exit devfreq_userspace_exit(void) 
	return;

}

module_exit(devfreq_userspace_exit);

MODULE_DESCRIPTION("DEVFREQ Userspace governor");

MODULE_LICENSE("GPL");