Skip to content

Commit

Permalink
ROUND_UP macro cleanup in drivers/char/lp.c
Browse files Browse the repository at this point in the history
ROUND_UP macro cleanup use DIV_ROUND_UP

Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Milind Arun Choudhary authored and Linus Torvalds committed May 8, 2007
1 parent 0e8638e commit b259d74
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/char/lp.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,6 @@
/* if you have more than 8 printers, remember to increase LP_NO */
#define LP_NO 8

/* ROUND_UP macro from fs/select.c */
#define ROUND_UP(x,y) (((x)+(y)-1)/(y))

static struct lp_struct lp_table[LP_NO];

static unsigned int lp_count = 0;
Expand Down Expand Up @@ -651,7 +648,7 @@ static int lp_ioctl(struct inode *inode, struct file *file,
(par_timeout.tv_usec < 0)) {
return -EINVAL;
}
to_jiffies = ROUND_UP(par_timeout.tv_usec, 1000000/HZ);
to_jiffies = DIV_ROUND_UP(par_timeout.tv_usec, 1000000/HZ);
to_jiffies += par_timeout.tv_sec * (long) HZ;
if (to_jiffies <= 0) {
return -EINVAL;
Expand Down

0 comments on commit b259d74

Please sign in to comment.