From: Russell King Date: Sat, 21 Nov 2009 12:58:13 +0000 (+0000) Subject: ARM: PNX4008: use msecs_to_jiffies() rather than open-coding it X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eed18b5fa4d297c681b00144e8c6942dd35d39a7;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git ARM: PNX4008: use msecs_to_jiffies() rather than open-coding it Signed-off-by: Russell King --- diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index ecdd5230ae36..2b0bd0b042d6 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c @@ -53,14 +53,14 @@ static inline int wait_reset(long timeout, struct i2c_pnx_algo_data *data) static inline void i2c_pnx_arm_timer(struct i2c_pnx_algo_data *alg_data) { struct timer_list *timer = &alg_data->mif.timer; - int expires = I2C_PNX_TIMEOUT / (1000 / HZ); + unsigned long expires = msecs_to_jiffies(I2C_PNX_TIMEOUT); if (expires <= 1) expires = 2; del_timer_sync(timer); - dev_dbg(&alg_data->adapter.dev, "Timer armed at %lu plus %u jiffies.\n", + dev_dbg(&alg_data->adapter.dev, "Timer armed at %lu plus %lu jiffies.\n", jiffies, expires); timer->expires = jiffies + expires;