--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
-@@ -1380,6 +1380,8 @@ static void clk_core_init_rate_req(struc
+@@ -1391,6 +1391,8 @@ static void clk_core_init_rate_req(struc
if (WARN_ON(!core || !req))
return;
parent = core->parent;
if (parent) {
req->best_parent_hw = parent->hw;
-@@ -1454,7 +1456,6 @@ unsigned long clk_hw_round_rate(struct c
+@@ -1465,7 +1467,6 @@ unsigned long clk_hw_round_rate(struct c
int ret;
struct clk_rate_request req;
req.rate = rate;
ret = clk_core_round_rate_nolock(hw->core, &req);
-@@ -1487,7 +1488,6 @@ long clk_round_rate(struct clk *clk, uns
+@@ -1498,7 +1499,6 @@ long clk_round_rate(struct clk *clk, uns
if (clk->exclusive_count)
clk_core_rate_unprotect(clk->core);
req.rate = rate;
ret = clk_core_round_rate_nolock(clk->core, &req);
-@@ -1994,8 +1994,6 @@ static struct clk_core *clk_calc_new_rat
+@@ -2005,8 +2005,6 @@ static struct clk_core *clk_calc_new_rat
struct clk_rate_request req;
req.rate = rate;