Commit f5154fbf authored by Julia Lawall's avatar Julia Lawall Committed by Jeff Garzik

claw: make use of DIV_ROUND_UP

The kernel.h macro DIV_ROUND_UP performs the computation
(((n) + (d) - 1) / (d)) but is perhaps more readable.
Signed-off-by: default avatarUrsula Braun <braunu@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 61da96be
...@@ -1851,8 +1851,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid) ...@@ -1851,8 +1851,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
} }
} }
/* See how many write buffers are required to hold this data */ /* See how many write buffers are required to hold this data */
numBuffers= ( skb->len + privptr->p_env->write_size - 1) / numBuffers = DIV_ROUND_UP(skb->len, privptr->p_env->write_size);
( privptr->p_env->write_size);
/* If that number of buffers isn't available, give up for now */ /* If that number of buffers isn't available, give up for now */
if (privptr->write_free_count < numBuffers || if (privptr->write_free_count < numBuffers ||
...@@ -2114,8 +2113,7 @@ init_ccw_bk(struct net_device *dev) ...@@ -2114,8 +2113,7 @@ init_ccw_bk(struct net_device *dev)
*/ */
ccw_blocks_perpage= PAGE_SIZE / CCWBK_SIZE; ccw_blocks_perpage= PAGE_SIZE / CCWBK_SIZE;
ccw_pages_required= ccw_pages_required=
(ccw_blocks_required+ccw_blocks_perpage -1) / DIV_ROUND_UP(ccw_blocks_required, ccw_blocks_perpage);
ccw_blocks_perpage;
#ifdef DEBUGMSG #ifdef DEBUGMSG
printk(KERN_INFO "%s: %s() > ccw_blocks_perpage=%d\n", printk(KERN_INFO "%s: %s() > ccw_blocks_perpage=%d\n",
...@@ -2131,30 +2129,29 @@ init_ccw_bk(struct net_device *dev) ...@@ -2131,30 +2129,29 @@ init_ccw_bk(struct net_device *dev)
* provide good performance. With packing buffers support 32k * provide good performance. With packing buffers support 32k
* buffers are used. * buffers are used.
*/ */
if (privptr->p_env->read_size < PAGE_SIZE) { if (privptr->p_env->read_size < PAGE_SIZE) {
claw_reads_perpage= PAGE_SIZE / privptr->p_env->read_size; claw_reads_perpage = PAGE_SIZE / privptr->p_env->read_size;
claw_read_pages= (privptr->p_env->read_buffers + claw_read_pages = DIV_ROUND_UP(privptr->p_env->read_buffers,
claw_reads_perpage -1) / claw_reads_perpage; claw_reads_perpage);
} }
else { /* > or equal */ else { /* > or equal */
privptr->p_buff_pages_perread= privptr->p_buff_pages_perread =
(privptr->p_env->read_size + PAGE_SIZE - 1) / PAGE_SIZE; DIV_ROUND_UP(privptr->p_env->read_size, PAGE_SIZE);
claw_read_pages= claw_read_pages = privptr->p_env->read_buffers *
privptr->p_env->read_buffers * privptr->p_buff_pages_perread; privptr->p_buff_pages_perread;
} }
if (privptr->p_env->write_size < PAGE_SIZE) { if (privptr->p_env->write_size < PAGE_SIZE) {
claw_writes_perpage= claw_writes_perpage =
PAGE_SIZE / privptr->p_env->write_size; PAGE_SIZE / privptr->p_env->write_size;
claw_write_pages= claw_write_pages = DIV_ROUND_UP(privptr->p_env->write_buffers,
(privptr->p_env->write_buffers + claw_writes_perpage -1) / claw_writes_perpage);
claw_writes_perpage;
} }
else { /* > or equal */ else { /* > or equal */
privptr->p_buff_pages_perwrite= privptr->p_buff_pages_perwrite =
(privptr->p_env->read_size + PAGE_SIZE - 1) / PAGE_SIZE; DIV_ROUND_UP(privptr->p_env->read_size, PAGE_SIZE);
claw_write_pages= claw_write_pages = privptr->p_env->write_buffers *
privptr->p_env->write_buffers * privptr->p_buff_pages_perwrite; privptr->p_buff_pages_perwrite;
} }
#ifdef DEBUGMSG #ifdef DEBUGMSG
if (privptr->p_env->read_size < PAGE_SIZE) { if (privptr->p_env->read_size < PAGE_SIZE) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment