Commit 93d8eb49 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by sanglipeng
Browse files

i2c: designware: Use DIV_ROUND_CLOSEST() macro 

stable inclusion
from stable-v5.10.166
commit 8949ef3a7a0c938e3813f79085af97f32d060347
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8949ef3a7a0c938e3813f79085af97f32d060347



--------------------------------

[ Upstream commit c045214a ]

Instead of open-coding DIV_ROUND_CLOSEST() and similar use the macros directly.
While at it, replace numbers with predefined SI metric prefixes.

No functional change intended.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
Stable-dep-of: c8c37bc5 ("i2c: designware: use casting of u64 in clock multiplication to avoid overflow")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 0f6bc419

drivers/i2c/busses/i2c-designware-common.c

+4 −4
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/regmap.h>

#include <linux/swab.h>

#include <linux/types.h>

#include <linux/units.h>



#include "i2c-designware-core.h"
@@ -347,7 +348,7 @@ u32 i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset) 
		 *

		 * If your hardware is free from tHD;STA issue, try this one.

		 */

		return (ic_clk * tSYMBOL + 500000) / 1000000 - 8 + offset;

		return DIV_ROUND_CLOSEST(ic_clk * tSYMBOL, MICRO) - 8 + offset;

	else

		/*

		 * Conditional expression:
@@ -363,8 +364,7 @@ u32 i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset) 
		 * The reason why we need to take into account "tf" here,

		 * is the same as described in i2c_dw_scl_lcnt().

		 */

		return (ic_clk * (tSYMBOL + tf) + 500000) / 1000000

			- 3 + offset;

		return DIV_ROUND_CLOSEST(ic_clk * (tSYMBOL + tf), MICRO) - 3 + offset;

}



u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset)
@@ -380,7 +380,7 @@ u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset) 
	 * account the fall time of SCL signal (tf).  Default tf value

	 * should be 0.3 us, for safety.

	 */

	return ((ic_clk * (tLOW + tf) + 500000) / 1000000) - 1 + offset;

	return DIV_ROUND_CLOSEST(ic_clk * (tLOW + tf), MICRO) - 1 + offset;

}



int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev)

drivers/i2c/busses/i2c-designware-platdrv.c

+3 −2
Original line number Diff line number Diff line
@@ -32,12 +32,13 @@ 
#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/suspend.h>

#include <linux/units.h>



#include "i2c-designware-core.h"



static u32 i2c_dw_get_clk_rate_khz(struct dw_i2c_dev *dev)

{

	return clk_get_rate(dev->clk)/1000;

	return clk_get_rate(dev->clk) / KILO;

}



#ifdef CONFIG_ACPI
@@ -284,7 +285,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) 


		if (!dev->sda_hold_time && t->sda_hold_ns)

			dev->sda_hold_time =

				div_u64(clk_khz * t->sda_hold_ns + 500000, 1000000);

				DIV_S64_ROUND_CLOSEST(clk_khz * t->sda_hold_ns, MICRO);

	}



	adap = &dev->adapter;