Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758484AbYBPOws (ORCPT ); Sat, 16 Feb 2008 09:52:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758077AbYBPOwi (ORCPT ); Sat, 16 Feb 2008 09:52:38 -0500 Received: from mgw1.diku.dk ([130.225.96.91]:34234 "EHLO mgw1.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753312AbYBPOwg (ORCPT ); Sat, 16 Feb 2008 09:52:36 -0500 Date: Sat, 16 Feb 2008 15:52:33 +0100 (MET) From: Julia Lawall To: schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 4/4] : More use DIV_ROUND_UP Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2883 Lines: 96 From: Julia Lawall The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) / (d)) but is perhaps more readable. An extract of the semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @haskernel@ @@ #include @depends on haskernel@ expression n,d; @@ ( - (n + d - 1) / d + DIV_ROUND_UP(n,d) | - (n + (d - 1)) / d + DIV_ROUND_UP(n,d) ) @depends on haskernel@ expression n,d; @@ - DIV_ROUND_UP((n),d) + DIV_ROUND_UP(n,d) @depends on haskernel@ expression n,d; @@ - DIV_ROUND_UP(n,(d)) + DIV_ROUND_UP(n,d) // Signed-off-by: Julia Lawall --- diff -u -p a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c --- a/drivers/s390/net/claw.c 2008-02-02 15:28:31.000000000 +0100 +++ b/drivers/s390/net/claw.c 2008-02-15 22:29:44.000000000 +0100 @@ -2114,8 +2114,7 @@ init_ccw_bk(struct net_device *dev) */ ccw_blocks_perpage= PAGE_SIZE / CCWBK_SIZE; ccw_pages_required= - (ccw_blocks_required+ccw_blocks_perpage -1) / - ccw_blocks_perpage; + DIV_ROUND_UP(ccw_blocks_required, ccw_blocks_perpage); #ifdef DEBUGMSG printk(KERN_INFO "%s: %s() > ccw_blocks_perpage=%d\n", @@ -2133,12 +2132,12 @@ init_ccw_bk(struct net_device *dev) */ if (privptr->p_env->read_size < PAGE_SIZE) { claw_reads_perpage= PAGE_SIZE / privptr->p_env->read_size; - claw_read_pages= (privptr->p_env->read_buffers + - claw_reads_perpage -1) / claw_reads_perpage; + claw_read_pages= + DIV_ROUND_UP(privptr->p_env->read_buffers, claw_reads_perpage); } else { /* > or equal */ 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= privptr->p_env->read_buffers * privptr->p_buff_pages_perread; } @@ -2146,13 +2145,13 @@ init_ccw_bk(struct net_device *dev) claw_writes_perpage= PAGE_SIZE / privptr->p_env->write_size; claw_write_pages= - (privptr->p_env->write_buffers + claw_writes_perpage -1) / - claw_writes_perpage; + DIV_ROUND_UP(privptr->p_env->write_buffers, + claw_writes_perpage); } else { /* > or equal */ 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= privptr->p_env->write_buffers * privptr->p_buff_pages_perwrite; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/