Skip to contentSkip to conversation

mfd: intel-lpss: Remove CLK_IS_ROOT

PATCH Applied Stephen Boyd 3 participants 3 messages Apr 20, 2016 – Apr 25, 2016

Subsystems (2)
Multifunction devices (MFD) Intel LPSS (Low Power SubSystem) drivers
lore
Share & tools
lore

Stephen Boyd

author
#0 lore raw

PATCH 1/1 mfd: intel-lpss: Remove CLK_IS_ROOT

This flag is a no-op now (see commit 47b0eeb3dc8a "clk: Deprecate CLK_IS_ROOT", 2016-02-02) so remove it.

Cc Andy Shevchenko <[email protected]>
Cc Mika Westerberg <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
---
 drivers/mfd/intel-lpss.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mfd/intel-lpss.c +2 -2
index 6352aaba96a4..9b738bb912f3 100644
@@ -336,8 +336,8 @@ static int intel_lpss_register_clock(struct intel_lpss *lpss)
 		return 0;
 
 	/* Root clock */
-	clk = clk_register_fixed_rate(NULL, dev_name(lpss->dev), NULL,
-				      CLK_IS_ROOT, lpss->info->clk_rate);
+	clk = clk_register_fixed_rate(NULL, dev_name(lpss->dev), NULL, 0,
+				      lpss->info->clk_rate);
 	if (IS_ERR(clk))
 		return PTR_ERR(clk);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Applied
#2 lore raw
In reply to Stephen Boyd
Quoted 9 lines · Stephen Boyd

This flag is a no-op now (see commit 47b0eeb3dc8a "clk: Deprecate CLK_IS_ROOT", 2016-02-02) so remove it.

Cc Andy Shevchenko <[email protected]>
Cc Mika Westerberg <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
---
 drivers/mfd/intel-lpss.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Quoted 15 lines
drivers/mfd/intel-lpss.c +2 -2
index 6352aaba96a4..9b738bb912f3 100644
@@ -336,8 +336,8 @@ static int intel_lpss_register_clock(struct intel_lpss *lpss)
 		return 0;
 
 	/* Root clock */
-	clk = clk_register_fixed_rate(NULL, dev_name(lpss->dev), NULL,
-				      CLK_IS_ROOT, lpss->info->clk_rate);
+	clk = clk_register_fixed_rate(NULL, dev_name(lpss->dev), NULL, 0,
+				      lpss->info->clk_rate);
 	if (IS_ERR(clk))
 		return PTR_ERR(clk);
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog