From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 1 Dec 2021 18:28:13 +0000 (+0100)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.294~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e944db9ec5cc5537781c55ecdcc2efdbf2f61b42;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	of-clk-make-linux-of_clk.h-self-contained.patch
---

diff --git a/queue-5.4/of-clk-make-linux-of_clk.h-self-contained.patch b/queue-5.4/of-clk-make-linux-of_clk.h-self-contained.patch
new file mode 100644
index 00000000000..4d3320458d1
--- /dev/null
+++ b/queue-5.4/of-clk-make-linux-of_clk.h-self-contained.patch
@@ -0,0 +1,47 @@
+From 5df867145f8adad9e5cdf9d67db1fbc0f71351e9 Mon Sep 17 00:00:00 2001
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+Date: Wed, 5 Feb 2020 20:46:49 +0100
+Subject: of: clk: Make <linux/of_clk.h> self-contained
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+
+commit 5df867145f8adad9e5cdf9d67db1fbc0f71351e9 upstream.
+
+Depending on include order:
+
+    include/linux/of_clk.h:11:45: warning: ‘struct device_node’ declared inside parameter list will not be visible outside of this definition or declaration
+     unsigned int of_clk_get_parent_count(struct device_node *np);
+						 ^~~~~~~~~~~
+    include/linux/of_clk.h:12:43: warning: ‘struct device_node’ declared inside parameter list will not be visible outside of this definition or declaration
+     const char *of_clk_get_parent_name(struct device_node *np, int index);
+					       ^~~~~~~~~~~
+    include/linux/of_clk.h:13:31: warning: ‘struct of_device_id’ declared inside parameter list will not be visible outside of this definition or declaration
+     void of_clk_init(const struct of_device_id *matches);
+				   ^~~~~~~~~~~~
+
+Fix this by adding forward declarations for struct device_node and
+struct of_device_id.
+
+Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Link: https://lkml.kernel.org/r/20200205194649.31309-1-geert+renesas@glider.be
+Signed-off-by: Stephen Boyd <sboyd@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/of_clk.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/include/linux/of_clk.h
++++ b/include/linux/of_clk.h
+@@ -6,6 +6,9 @@
+ #ifndef __LINUX_OF_CLK_H
+ #define __LINUX_OF_CLK_H
+ 
++struct device_node;
++struct of_device_id;
++
+ #if defined(CONFIG_COMMON_CLK) && defined(CONFIG_OF)
+ 
+ unsigned int of_clk_get_parent_count(struct device_node *np);
diff --git a/queue-5.4/series b/queue-5.4/series
index 65e6880e7ab..58fb6554642 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -1 +1,2 @@
 nfsv42-fix-pagecache-invalidation-after-copy-clone.patch
+of-clk-make-linux-of_clk.h-self-contained.patch