From: Milind Arun Choudhary <milindchoudhary@gmail.com>
Date: Tue, 8 May 2007 07:28:57 +0000 (-0700)
Subject: ROUND_UP macro cleanup in drivers/char/lp.c
X-Git-Tag: v2.6.22-rc1~681
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b259d74b39595f6ac74c3627b9c3657ac90249a0;p=linux-2.6

ROUND_UP macro cleanup in drivers/char/lp.c

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>
---

diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index fa626034a6..62051f8b09 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -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;