diff --git a/target/linux/rockchip/patches-6.6/111-05-clk-rockchip-fix-error-for-unknown-clocks.patch b/target/linux/rockchip/patches-6.6/111-05-clk-rockchip-fix-error-for-unknown-clocks.patch deleted file mode 100644 index 4db2b80674..0000000000 --- a/target/linux/rockchip/patches-6.6/111-05-clk-rockchip-fix-error-for-unknown-clocks.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Sebastian Reichel -To: Michael Turquette , - Stephen Boyd , - linux-clk@vger.kernel.org -Cc: Elaine Zhang , - Kever Yang , - Heiko Stuebner , - Rob Herring , - Krzysztof Kozlowski , - Conor Dooley , - huangtao@rock-chips.com, andy.yan@rock-chips.com, - Michal Tomek , Ilya K , - Chad LeClair , - devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, - Sebastian Reichel , - kernel@collabora.com -Subject: [PATCH v9 5/7] clk: rockchip: fix error for unknown clocks -Date: Mon, 25 Mar 2024 20:33:36 +0100 [thread overview] -Message-ID: <20240325193609.237182-6-sebastian.reichel@collabora.com> (raw) -In-Reply-To: <20240325193609.237182-1-sebastian.reichel@collabora.com> - -There is a clk == NULL check after the switch to check for -unsupported clk types. Since clk is re-assigned in a loop, -this check is useless right now for anything but the first -round. Let's fix this up by assigning clk = NULL in the -loop before the switch statement. - -Signed-off-by: Sebastian Reichel ---- - drivers/clk/rockchip/clk.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/clk/rockchip/clk.c -+++ b/drivers/clk/rockchip/clk.c -@@ -444,12 +444,13 @@ void rockchip_clk_register_branches(stru - struct rockchip_clk_branch *list, - unsigned int nr_clk) - { -- struct clk *clk = NULL; -+ struct clk *clk; - unsigned int idx; - unsigned long flags; - - for (idx = 0; idx < nr_clk; idx++, list++) { - flags = list->flags; -+ clk = NULL; - - /* catch simple muxes */ - switch (list->branch_type) {