diff options
| author |   Milind Arun Choudhary <milindchoudhary@gmail.com> | 2007-05-08 00:28:57 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:08 -0700 |
| commit | b259d74b39595f6ac74c3627b9c3657ac90249a0 (patch) | |
| tree | 28c9bb48ea94b9afef2228dc57e04866941e7adc /drivers/char/lp.c | |
| parent | Deprecate SA_xxx interrupt flags -V2 (diff) | |
| download | linux-dev-b259d74b39595f6ac74c3627b9c3657ac90249a0.tar.xz linux-dev-b259d74b39595f6ac74c3627b9c3657ac90249a0.zip | |
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>
Diffstat (limited to 'drivers/char/lp.c')
| -rw-r--r-- | drivers/char/lp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/char/lp.c b/drivers/char/lp.c index fa626034a6e2..62051f8b0910 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; |