Merge 'clk-notify' into clk-next (5ff5ec59) · Commits · e / devices / android_kernel_fairphone_FP4

include/linux/clk.h

+14 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,6 @@ struct device;

		struct clk;

		#ifdef CONFIG_COMMON_CLK

		/**
		* DOC: clk notifier callback types
		*
		@@ -78,6 +76,8 @@ struct clk_notifier_data {
		unsigned long new_rate;
		};

		#ifdef CONFIG_COMMON_CLK

		/**
		* clk_notifier_register: register a clock rate-change notifier callback
		* @clk: clock whose rate we are interested in
		@@ -140,6 +140,18 @@ bool clk_is_match(const struct clk p, const struct clk q);

		#else

		static inline int clk_notifier_register(struct clk *clk,
		struct notifier_block *nb)
		{
		return -ENOTSUPP;
		}

		static inline int clk_notifier_unregister(struct clk *clk,
		struct notifier_block *nb)
		{
		return -ENOTSUPP;
		}

		static inline long clk_get_accuracy(struct clk *clk)
		{
		return -ENOTSUPP;