From ecefa6425976ccb0e491cbd7b36456af540b4775 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 24 Jun 2011 04:33:01 +0000
Subject: [PATCH] --- yaml --- r: 255963 b: refs/heads/master c:
 9118f08a7794e9a4908afbb0f9bc9455325a5631 h: refs/heads/master i:   255961:
 bcf328ecae3666bc34cb3944a2c673a20cf739f8   255959:
 7b92190d42aaec8de74428e147c4bb237b0ed12c v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/net/can/bfin_can.c | 21 ++++++---------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 5727df605c16..3bdb68ea8507 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aca7a3acb19a7a4b1084f6f2411f6eaf52dd79c0
+refs/heads/master: 9118f08a7794e9a4908afbb0f9bc9455325a5631
diff --git a/trunk/drivers/net/can/bfin_can.c b/trunk/drivers/net/can/bfin_can.c
index b6e890d28366..dc6ef4a9e02a 100644
--- a/trunk/drivers/net/can/bfin_can.c
+++ b/trunk/drivers/net/can/bfin_can.c
@@ -243,21 +243,12 @@ static int bfin_can_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	/* fill id */
 	if (id & CAN_EFF_FLAG) {
 		bfin_write16(&reg->chl[TRANSMIT_CHL].id0, id);
-		if (id & CAN_RTR_FLAG)
-			writew(((id & 0x1FFF0000) >> 16) | IDE | AME | RTR,
-					&reg->chl[TRANSMIT_CHL].id1);
-		else
-			writew(((id & 0x1FFF0000) >> 16) | IDE | AME,
-					&reg->chl[TRANSMIT_CHL].id1);
-
-	} else {
-		if (id & CAN_RTR_FLAG)
-			writew((id << 2) | AME | RTR,
-				&reg->chl[TRANSMIT_CHL].id1);
-		else
-			bfin_write16(&reg->chl[TRANSMIT_CHL].id1,
-					(id << 2) | AME);
-	}
+		val = ((id & 0x1FFF0000) >> 16) | IDE;
+	} else
+		val = (id << 2);
+	if (id & CAN_RTR_FLAG)
+		val |= RTR;
+	bfin_write16(&reg->chl[TRANSMIT_CHL].id1, val | AME);
 
 	/* fill payload */
 	for (i = 0; i < 8; i += 2) {