i2c: designware: fix i2c_dw_clk_rate() return size to be u32
Subsystems (3)
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")
Signed-off-by Hanna Hawa <[email protected]>
--- 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
@@ -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
@@ -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
Quoted 2 lines · Hanna Hawa
Make
i2c_dw_clk_rate()to return u32 instead of unsigned long, as the function return the value ofget_clk_rate_khz()which returns u32.
Makes sense.
Reviewed-by Andy Shevchenko <[email protected]>
Quoted 36 lines
Fixes b33af11de236 ("i2c: designware: Do not require clock when SSCN and FFCN are provided")Signed-off-by Hanna Hawa <[email protected]>--- 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@@ -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@@ -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
Jarkko Nikula
Acked-byQuoted 7 lines · Andy Shevchenko
Quoted 2 lines · Hanna Hawa
Make
i2c_dw_clk_rate()to return u32 instead of unsigned long, as the function return the value ofget_clk_rate_khz()which returns u32.Makes sense.
Reviewed-by Andy Shevchenko <[email protected]>
Acked-by Jarkko Nikula <[email protected]>
Wolfram Sang
AppliedQuoted 5 lines · Hanna Hawa
Make
i2c_dw_clk_rate()to return u32 instead of unsigned long, as the function return the value ofget_clk_rate_khz()which returns u32.Fixes b33af11de236 ("i2c: designware: Do not require clock when SSCN and FFCN are provided")Signed-off-by Hanna Hawa <[email protected]>
Applied to for-next, thanks!