Merge tag 'pm-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (85a2c56c) · Commits · 戴 / test

Pull power management fix from Rafael Wysocki: "Fix a recently introduced build issue in the cpufreq SCMI driver (Sudeep Holla)" * tag 'pm-5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq: scmi: Fix build for !CONFIG_COMMON_CLK

drivers/cpufreq/scmi-cpufreq.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -236,13 +236,15 @@ static int scmi_cpufreq_probe(struct scmi_device *sdev)
		if (!handle \|\| !handle->perf_ops)
		return -ENODEV;

		#ifdef CONFIG_COMMON_CLK
		/* dummy clock provider as needed by OPP if clocks property is used */
		if (of_find_property(dev->of_node, "#clock-cells", NULL))
		devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, NULL);
		#endif

		ret = cpufreq_register_driver(&scmi_cpufreq_driver);
		if (ret) {
		dev_err(&sdev->dev, "%s: registering cpufreq failed, err: %d\n",
		dev_err(dev, "%s: registering cpufreq failed, err: %d\n",
		__func__, ret);
		}

Admin message