PM: Drop CONFIG_PM_RUNTIME from the driver core (d30d819d) · Commits · 戴 / test

drivers/base/power/clock_ops.c

+2 −67

Original line number	Original line	Diff line number	Diff line
	@@ -256,10 +256,6 @@ void pm_clk_destroy(struct device *dev)
	}		}
	}		}

	#endif /* CONFIG_PM */

	#ifdef CONFIG_PM_RUNTIME

	/**		/**
	* pm_clk_suspend - Disable clocks in a device's PM clock list.		* pm_clk_suspend - Disable clocks in a device's PM clock list.
	* @dev: Device to disable the clocks for.		* @dev: Device to disable the clocks for.
	@@ -373,68 +369,7 @@ static int pm_clk_notify(struct notifier_block *nb,
	return 0;		return 0;
	}		}

	#else /* !CONFIG_PM_RUNTIME */		#else /* !CONFIG_PM */

	#ifdef CONFIG_PM

	/**
	* pm_clk_suspend - Disable clocks in a device's PM clock list.
	* @dev: Device to disable the clocks for.
	*/
	int pm_clk_suspend(struct device *dev)
	{
	struct pm_subsys_data *psd = dev_to_psd(dev);
	struct pm_clock_entry *ce;
	unsigned long flags;

	dev_dbg(dev, "%s()\n", __func__);

	/* If there is no driver, the clocks are already disabled. */
	if (!psd \|\| !dev->driver)
	return 0;

	spin_lock_irqsave(&psd->lock, flags);

	list_for_each_entry_reverse(ce, &psd->clock_list, node) {
	if (ce->status < PCE_STATUS_ERROR) {
	if (ce->status == PCE_STATUS_ENABLED)
	clk_disable(ce->clk);
	ce->status = PCE_STATUS_ACQUIRED;
	}
	}

	spin_unlock_irqrestore(&psd->lock, flags);

	return 0;
	}

	/**
	* pm_clk_resume - Enable clocks in a device's PM clock list.
	* @dev: Device to enable the clocks for.
	*/
	int pm_clk_resume(struct device *dev)
	{
	struct pm_subsys_data *psd = dev_to_psd(dev);
	struct pm_clock_entry *ce;
	unsigned long flags;

	dev_dbg(dev, "%s()\n", __func__);

	/* If there is no driver, the clocks should remain disabled. */
	if (!psd \|\| !dev->driver)
	return 0;

	spin_lock_irqsave(&psd->lock, flags);

	list_for_each_entry(ce, &psd->clock_list, node)
	__pm_clk_enable(dev, ce);

	spin_unlock_irqrestore(&psd->lock, flags);

	return 0;
	}

	#endif /* CONFIG_PM */

	/**		/**
	* enable_clock - Enable a device clock.		* enable_clock - Enable a device clock.
	@@ -514,7 +449,7 @@ static int pm_clk_notify(struct notifier_block *nb,
	return 0;		return 0;
	}		}

	#endif /* !CONFIG_PM_RUNTIME */		#endif /* !CONFIG_PM */

	/**		/**
	* pm_clk_add_notifier - Add bus type notifier for power management clocks.		* pm_clk_add_notifier - Add bus type notifier for power management clocks.

drivers/base/power/domain.c

+3 −31

Original line number	Original line	Diff line number	Diff line
	@@ -280,8 +280,6 @@ int pm_genpd_name_poweron(const char *domain_name)
	return genpd ? pm_genpd_poweron(genpd) : -EINVAL;		return genpd ? pm_genpd_poweron(genpd) : -EINVAL;
	}		}

	#ifdef CONFIG_PM_RUNTIME

	static int genpd_start_dev_no_timing(struct generic_pm_domain *genpd,		static int genpd_start_dev_no_timing(struct generic_pm_domain *genpd,
	struct device *dev)		struct device *dev)
	{		{
	@@ -755,24 +753,6 @@ static int __init genpd_poweroff_unused(void)
	}		}
	late_initcall(genpd_poweroff_unused);		late_initcall(genpd_poweroff_unused);

	#else

	static inline int genpd_dev_pm_qos_notifier(struct notifier_block *nb,
	unsigned long val, void *ptr)
	{
	return NOTIFY_DONE;
	}

	static inline void
	genpd_queue_power_off_work(struct generic_pm_domain *genpd) {}

	static inline void genpd_power_off_work_fn(struct work_struct *work) {}

	#define pm_genpd_runtime_suspend NULL
	#define pm_genpd_runtime_resume NULL

	#endif /* CONFIG_PM_RUNTIME */

	#ifdef CONFIG_PM_SLEEP		#ifdef CONFIG_PM_SLEEP

	/**		/**
	@@ -1364,7 +1344,7 @@ void pm_genpd_syscore_poweron(struct device *dev)
	}		}
	EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron);		EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron);

	#else		#else /* !CONFIG_PM_SLEEP */

	#define pm_genpd_prepare NULL		#define pm_genpd_prepare NULL
	#define pm_genpd_suspend NULL		#define pm_genpd_suspend NULL
	@@ -2220,7 +2200,7 @@ int genpd_dev_pm_attach(struct device *dev)
	return 0;		return 0;
	}		}
	EXPORT_SYMBOL_GPL(genpd_dev_pm_attach);		EXPORT_SYMBOL_GPL(genpd_dev_pm_attach);
	#endif		#endif /* CONFIG_PM_GENERIC_DOMAINS_OF */


	/* debugfs support */		/* debugfs support */
	@@ -2236,10 +2216,8 @@ static struct dentry *pm_genpd_debugfs_dir;

	/*		/*
	* TODO: This function is a slightly modified version of rtpm_status_show		* TODO: This function is a slightly modified version of rtpm_status_show
	* from sysfs.c, but dependencies between PM_GENERIC_DOMAINS and PM_RUNTIME		* from sysfs.c, so generalize it.
	* are too loose to generalize it.
	*/		*/
	#ifdef CONFIG_PM_RUNTIME
	static void rtpm_status_str(struct seq_file s, struct device dev)		static void rtpm_status_str(struct seq_file s, struct device dev)
	{		{
	static const char * const status_lookup[] = {		static const char * const status_lookup[] = {
	@@ -2261,12 +2239,6 @@ static void rtpm_status_str(struct seq_file s, struct device dev)

	seq_puts(s, p);		seq_puts(s, p);
	}		}
	#else
	static void rtpm_status_str(struct seq_file s, struct device dev)
	{
	seq_puts(s, "active");
	}
	#endif

	static int pm_genpd_summary_one(struct seq_file *s,		static int pm_genpd_summary_one(struct seq_file *s,
	struct generic_pm_domain *gpd)		struct generic_pm_domain *gpd)

drivers/base/power/domain_governor.c

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -11,8 +11,6 @@
	#include <linux/pm_qos.h>		#include <linux/pm_qos.h>
	#include <linux/hrtimer.h>		#include <linux/hrtimer.h>

	#ifdef CONFIG_PM_RUNTIME

	static int dev_update_qos_constraint(struct device dev, void data)		static int dev_update_qos_constraint(struct device dev, void data)
	{		{
	s64 *constraint_ns_p = data;		s64 *constraint_ns_p = data;
	@@ -227,15 +225,6 @@ static bool always_on_power_down_ok(struct dev_pm_domain *domain)
	return false;		return false;
	}		}

	#else /* !CONFIG_PM_RUNTIME */

	static inline bool default_stop_ok(struct device *dev) { return false; }

	#define default_power_down_ok NULL
	#define always_on_power_down_ok NULL

	#endif /* !CONFIG_PM_RUNTIME */

	struct dev_power_governor simple_qos_governor = {		struct dev_power_governor simple_qos_governor = {
	.stop_ok = default_stop_ok,		.stop_ok = default_stop_ok,
	.power_down_ok = default_power_down_ok,		.power_down_ok = default_power_down_ok,

drivers/base/power/power.h

+25 −31

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@ static inline void device_pm_init_common(struct device *dev)
	}		}
	}		}

	#ifdef CONFIG_PM_RUNTIME		#ifdef CONFIG_PM

	static inline void pm_runtime_early_init(struct device *dev)		static inline void pm_runtime_early_init(struct device *dev)
	{		{
	@@ -20,7 +20,21 @@ static inline void pm_runtime_early_init(struct device *dev)
	extern void pm_runtime_init(struct device *dev);		extern void pm_runtime_init(struct device *dev);
	extern void pm_runtime_remove(struct device *dev);		extern void pm_runtime_remove(struct device *dev);

	#else /* !CONFIG_PM_RUNTIME */		/*
			* sysfs.c
			*/

			extern int dpm_sysfs_add(struct device *dev);
			extern void dpm_sysfs_remove(struct device *dev);
			extern void rpm_sysfs_remove(struct device *dev);
			extern int wakeup_sysfs_add(struct device *dev);
			extern void wakeup_sysfs_remove(struct device *dev);
			extern int pm_qos_sysfs_add_resume_latency(struct device *dev);
			extern void pm_qos_sysfs_remove_resume_latency(struct device *dev);
			extern int pm_qos_sysfs_add_flags(struct device *dev);
			extern void pm_qos_sysfs_remove_flags(struct device *dev);

			#else /* CONFIG_PM */

	static inline void pm_runtime_early_init(struct device *dev)		static inline void pm_runtime_early_init(struct device *dev)
	{		{
	@@ -30,7 +44,15 @@ static inline void pm_runtime_early_init(struct device *dev)
	static inline void pm_runtime_init(struct device *dev) {}		static inline void pm_runtime_init(struct device *dev) {}
	static inline void pm_runtime_remove(struct device *dev) {}		static inline void pm_runtime_remove(struct device *dev) {}

	#endif /* !CONFIG_PM_RUNTIME */		static inline int dpm_sysfs_add(struct device *dev) { return 0; }
			static inline void dpm_sysfs_remove(struct device *dev) {}
			static inline void rpm_sysfs_remove(struct device *dev) {}
			static inline int wakeup_sysfs_add(struct device *dev) { return 0; }
			static inline void wakeup_sysfs_remove(struct device *dev) {}
			static inline int pm_qos_sysfs_add(struct device *dev) { return 0; }
			static inline void pm_qos_sysfs_remove(struct device *dev) {}

			#endif

	#ifdef CONFIG_PM_SLEEP		#ifdef CONFIG_PM_SLEEP

	@@ -77,31 +99,3 @@ static inline void device_pm_init(struct device *dev)
	device_pm_sleep_init(dev);		device_pm_sleep_init(dev);
	pm_runtime_init(dev);		pm_runtime_init(dev);
	}		}

	#ifdef CONFIG_PM

	/*
	* sysfs.c
	*/

	extern int dpm_sysfs_add(struct device *dev);
	extern void dpm_sysfs_remove(struct device *dev);
	extern void rpm_sysfs_remove(struct device *dev);
	extern int wakeup_sysfs_add(struct device *dev);
	extern void wakeup_sysfs_remove(struct device *dev);
	extern int pm_qos_sysfs_add_resume_latency(struct device *dev);
	extern void pm_qos_sysfs_remove_resume_latency(struct device *dev);
	extern int pm_qos_sysfs_add_flags(struct device *dev);
	extern void pm_qos_sysfs_remove_flags(struct device *dev);

	#else /* CONFIG_PM */

	static inline int dpm_sysfs_add(struct device *dev) { return 0; }
	static inline void dpm_sysfs_remove(struct device *dev) {}
	static inline void rpm_sysfs_remove(struct device *dev) {}
	static inline int wakeup_sysfs_add(struct device *dev) { return 0; }
	static inline void wakeup_sysfs_remove(struct device *dev) {}
	static inline int pm_qos_sysfs_add(struct device *dev) { return 0; }
	static inline void pm_qos_sysfs_remove(struct device *dev) {}

	#endif

drivers/base/power/qos.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -599,7 +599,6 @@ int dev_pm_qos_add_ancestor_request(struct device *dev,
	}		}
	EXPORT_SYMBOL_GPL(dev_pm_qos_add_ancestor_request);		EXPORT_SYMBOL_GPL(dev_pm_qos_add_ancestor_request);

	#ifdef CONFIG_PM_RUNTIME
	static void __dev_pm_qos_drop_user_request(struct device *dev,		static void __dev_pm_qos_drop_user_request(struct device *dev,
	enum dev_pm_qos_req_type type)		enum dev_pm_qos_req_type type)
	{		{
	@@ -880,7 +879,3 @@ int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val)
	mutex_unlock(&dev_pm_qos_mtx);		mutex_unlock(&dev_pm_qos_mtx);
	return ret;		return ret;
	}		}
	#else /* !CONFIG_PM_RUNTIME */
	static void __dev_pm_qos_hide_latency_limit(struct device *dev) {}
	static void __dev_pm_qos_hide_flags(struct device *dev) {}
	#endif /* CONFIG_PM_RUNTIME */

Admin message