Skip to contentSkip to conversation

mfd: intel_quark_i2c_gpio: Remove CLK_IS_ROOT

PATCH Applied Stephen Boyd 3 participants 3 messages Apr 20, 2016 – Apr 25, 2016 Multifunction devices (MFD)

lore
Share & tools
lore

Stephen Boyd

author
#0 lore raw

PATCH 1/1 mfd: intel_quark_i2c_gpio: 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]>
Signed-off-by Stephen Boyd <[email protected]>
---
 drivers/mfd/intel_quark_i2c_gpio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/intel_quark_i2c_gpio.c +1 -1
index 24c2d291b1dc..ce17ae8a81c9 100644
@@ -130,7 +130,7 @@ static int intel_quark_register_i2c_clk(struct device *dev)
 
 	i2c_clk = clk_register_fixed_rate(dev,
 					  INTEL_QUARK_I2C_CONTROLLER_CLK, NULL,
-					  CLK_IS_ROOT, INTEL_QUARK_I2C_CLK_HZ);
+					  0, INTEL_QUARK_I2C_CLK_HZ);
 	if (IS_ERR(i2c_clk))
 		return PTR_ERR(i2c_clk);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Acked-by on v1 1/1
#1 lore raw
Quoted 5 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]>
Signed-off-by Stephen Boyd <[email protected]>
Acked-by Andy Shevchenko <[email protected]>>
Quoted 21 lines

---
 drivers/mfd/intel_quark_i2c_gpio.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/intel_quark_i2c_gpio.c +0 -0
index 24c2d291b1dc..ce17ae8a81c9 100644
@@ -130,7 +130,7 @@ static int intel_quark_register_i2c_clk(struct
 device *dev)


  i2c_clk = clk_register_fixed_rate(dev, INTEL_QUARK_I2C_CONTROLLER_ CLK, NULL,

drivers/mfd/intel_quark_i2c_gpio.c +0 -1
-					  CLK_IS_ROOT,

INTEL_QUARK_I2C_CLK_HZ);

drivers/mfd/intel_quark_i2c_gpio.c +1 -0
+					  0, INTEL_QUARK_I2C_CLK_HZ);

  if (IS_ERR(i2c_clk))
  return PTR_ERR(i2c_clk);

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
Applied
#2 lore raw
In reply to Stephen Boyd
Quoted 8 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]>
Signed-off-by Stephen Boyd <[email protected]>
---
 drivers/mfd/intel_quark_i2c_gpio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

Quoted 13 lines
drivers/mfd/intel_quark_i2c_gpio.c +1 -1
index 24c2d291b1dc..ce17ae8a81c9 100644
@@ -130,7 +130,7 @@ static int intel_quark_register_i2c_clk(struct device *dev)
 
 	i2c_clk = clk_register_fixed_rate(dev,
 					  INTEL_QUARK_I2C_CONTROLLER_CLK, NULL,
-					  CLK_IS_ROOT, INTEL_QUARK_I2C_CLK_HZ);
+					  0, INTEL_QUARK_I2C_CLK_HZ);
 	if (IS_ERR(i2c_clk))
 		return PTR_ERR(i2c_clk);
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog