| Message ID | 1589970713-19944-1-git-send-email-qii.wang@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [next] i2c: mediatek: Use div_u64 for 64-bit division to fix 32-bit kernels | expand |
On Wed, May 20, 2020 at 06:31:53PM +0800, qii.wang@mediatek.com wrote: > From: Qii Wang <qii.wang@mediatek.com> > > Use div_u64 for 64-bit division, and change sample_ns type to > unsigned int. Otherwise, the module will reference __udivdi3 > under 32-bit kernels, which is not allowed in kernel space. > > Signed-off-by: Qii Wang <qii.wang@mediatek.com> Applied to for-next by squashing it into the relevant commit, thanks!
On 5/20/20 3:31 AM, qii.wang@mediatek.com wrote: > From: Qii Wang <qii.wang@mediatek.com> > > Use div_u64 for 64-bit division, and change sample_ns type to > unsigned int. Otherwise, the module will reference __udivdi3 > under 32-bit kernels, which is not allowed in kernel space. > > Signed-off-by: Qii Wang <qii.wang@mediatek.com> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested thanks. > --- > drivers/i2c/busses/i2c-mt65xx.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c > index 7020618..deef69e 100644 > --- a/drivers/i2c/busses/i2c-mt65xx.c > +++ b/drivers/i2c/busses/i2c-mt65xx.c > @@ -551,7 +551,8 @@ static int mtk_i2c_check_ac_timing(struct mtk_i2c *i2c, > const struct i2c_spec_values *spec; > unsigned int su_sta_cnt, low_cnt, high_cnt, max_step_cnt; > unsigned int sda_max, sda_min, clk_ns, max_sta_cnt = 0x3f; > - long long sample_ns = (1000000000 * (sample_cnt + 1)) / clk_src; > + unsigned int sample_ns = div_u64(1000000000ULL * (sample_cnt + 1), > + clk_src); > > if (!i2c->dev_comp->timing_adjust) > return 0; >
diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c index 7020618..deef69e 100644 --- a/drivers/i2c/busses/i2c-mt65xx.c +++ b/drivers/i2c/busses/i2c-mt65xx.c @@ -551,7 +551,8 @@ static int mtk_i2c_check_ac_timing(struct mtk_i2c *i2c, const struct i2c_spec_values *spec; unsigned int su_sta_cnt, low_cnt, high_cnt, max_step_cnt; unsigned int sda_max, sda_min, clk_ns, max_sta_cnt = 0x3f; - long long sample_ns = (1000000000 * (sample_cnt + 1)) / clk_src; + unsigned int sample_ns = div_u64(1000000000ULL * (sample_cnt + 1), + clk_src); if (!i2c->dev_comp->timing_adjust) return 0;