Commit b259d74b authored by Milind Arun Choudhary's avatar Milind Arun Choudhary Committed by Linus Torvalds
Browse files

ROUND_UP macro cleanup in drivers/char/lp.c 



ROUND_UP macro cleanup use DIV_ROUND_UP

Signed-off-by: default avatarMilind Arun Choudhary <milindchoudhary@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0e8638e2

drivers/char/lp.c

+1 −4
Original line number Diff line number Diff line
@@ -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;
@@ -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;