Skip to content

Commit

Permalink
ARM: PNX4008: use msecs_to_jiffies() rather than open-coding it
Browse files Browse the repository at this point in the history
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Feb 12, 2010
1 parent 7e20c83 commit eed18b5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/i2c/busses/i2c-pnx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit eed18b5

Please sign in to comment.