Skip to contentSkip to conversation

i2c: designware: fix i2c_dw_clk_rate() return size to be u32

PATCH Applied Hanna Hawa 4 participants 4 messages Dec 19, 2022 – Jan 9, 2023

Subsystems (3)
lore
Share & tools
lore

Hanna Hawa

author
#0 lore raw

PATCH 1/1 i2c: designware: fix i2c_dw_clk_rate() return size to be u32

Make i2c_dw_clk_rate() to return u32 instead of unsigned long, as the function return the value of get_clk_rate_khz() which returns u32.

Fixes b33af11de236 ("i2c: designware: Do not require clock when SSCN and FFCN are provided")
---
 drivers/i2c/busses/i2c-designware-common.c | 2 +-
 drivers/i2c/busses/i2c-designware-core.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-designware-common.c +1 -1
index c023b691441e..e0a46dfd1c15 100644
@@ -462,7 +462,7 @@ void __i2c_dw_disable(struct dw_i2c_dev *dev)
 	dev_warn(dev->dev, "timeout in disabling adapter\n");
 }
 
-unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev)
+u32 i2c_dw_clk_rate(struct dw_i2c_dev *dev)
 {
 	/*
 	 * Clock is not necessary if we got LCNT/HCNT values directly from
drivers/i2c/busses/i2c-designware-core.h +1 -1
index 4d3a3b464ecd..56a029da448a 100644
@@ -322,7 +322,7 @@ int i2c_dw_init_regmap(struct dw_i2c_dev *dev);
 u32 i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset);
 u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset);
 int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev);
-unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev);
+u32 i2c_dw_clk_rate(struct dw_i2c_dev *dev);
 int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare);
 int i2c_dw_acquire_lock(struct dw_i2c_dev *dev);
 void i2c_dw_release_lock(struct dw_i2c_dev *dev);
Signature · 1 line
2.38.1
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Hanna Hawa

Make i2c_dw_clk_rate() to return u32 instead of unsigned long, as the function return the value of get_clk_rate_khz() which returns u32.

Makes sense.

Quoted 36 lines
Fixes b33af11de236 ("i2c: designware: Do not require clock when SSCN and FFCN are provided")
---
 drivers/i2c/busses/i2c-designware-common.c | 2 +-
 drivers/i2c/busses/i2c-designware-core.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-designware-common.c +1 -1
index c023b691441e..e0a46dfd1c15 100644
@@ -462,7 +462,7 @@ void __i2c_dw_disable(struct dw_i2c_dev *dev)
 	dev_warn(dev->dev, "timeout in disabling adapter\n");
 }
 
-unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev)
+u32 i2c_dw_clk_rate(struct dw_i2c_dev *dev)
 {
 	/*
 	 * Clock is not necessary if we got LCNT/HCNT values directly from
drivers/i2c/busses/i2c-designware-core.h +1 -1
index 4d3a3b464ecd..56a029da448a 100644
@@ -322,7 +322,7 @@ int i2c_dw_init_regmap(struct dw_i2c_dev *dev);
 u32 i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset);
 u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset);
 int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev);
-unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev);
+u32 i2c_dw_clk_rate(struct dw_i2c_dev *dev);
 int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare);
 int i2c_dw_acquire_lock(struct dw_i2c_dev *dev);
 void i2c_dw_release_lock(struct dw_i2c_dev *dev);
Signature · 1 line
2.38.1
Signature · 2 lines
With Best Regards,
Andy Shevchenko
Applied
#3 lore raw
In reply to Hanna Hawa
Quoted 5 lines · Hanna Hawa

Make i2c_dw_clk_rate() to return u32 instead of unsigned long, as the function return the value of get_clk_rate_khz() which returns u32.

Fixes b33af11de236 ("i2c: designware: Do not require clock when SSCN and FFCN are provided")

Applied to for-next, thanks!