aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2009-08-01 05:51:06 -0400
committerDavid S. Miller <davem@davemloft.net>2009-08-02 15:54:18 -0400
commit39506a552b4b302540e1f9c6c93a122df353e57d (patch)
treeb25df408d8a8fab89be66bca848d8b53d277bdb5
parent88e7b76ef7cf939a0cf23a1902030211b20837fe (diff)
drivers/net: Use DIV_ROUND_CLOSEST
The kernel.h macro DIV_ROUND_CLOSEST performs the computation (x + d/2)/d but is perhaps more readable. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @haskernel@ @@ #include <linux/kernel.h> @depends on haskernel@ expression x,__divisor; @@ - (((x) + ((__divisor) / 2)) / (__divisor)) + DIV_ROUND_CLOSEST(x,__divisor) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/b44.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 1f7f015442df..07c92f34d8d8 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -1297,7 +1297,8 @@ static void b44_chip_reset(struct b44 *bp, int reset_kind)
1297 switch (sdev->bus->bustype) { 1297 switch (sdev->bus->bustype) {
1298 case SSB_BUSTYPE_SSB: 1298 case SSB_BUSTYPE_SSB:
1299 bw32(bp, B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE | 1299 bw32(bp, B44_MDIO_CTRL, (MDIO_CTRL_PREAMBLE |
1300 (((ssb_clockspeed(sdev->bus) + (B44_MDC_RATIO / 2)) / B44_MDC_RATIO) 1300 (DIV_ROUND_CLOSEST(ssb_clockspeed(sdev->bus),
1301 B44_MDC_RATIO)
1301 & MDIO_CTRL_MAXF_MASK))); 1302 & MDIO_CTRL_MAXF_MASK)));
1302 break; 1303 break;
1303 case SSB_BUSTYPE_PCI: 1304 case SSB_BUSTYPE_PCI: