ARM: PNX4008: use msecs_to_jiffies() rather than open-coding it
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 21 Nov 2009 12:58:13 +0000 (12:58 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Feb 2010 17:32:42 +0000 (17:32 +0000)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/i2c/busses/i2c-pnx.c

index ecdd5230ae3660990b3ebf0d76c4da8d77fe76fd..2b0bd0b042d6df7bd8513f20232619853c130939 100644 (file)
@@ -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;