can: bfin_can: simplify xmit id1 setup
If we look closely, the 4 writes to TRANSMIT_CHL.id1 can be collapsed down into much simpler code. So do just that. This also fixes a build failure due to the I/O macros no longer getting pulled in. Their minor (and accidental) usage here gets dropped as part of the unification. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Wolfgang Grandegger <wg@grandegger.com> Acked-by: Kurt Van Dijck <kurt.van.dijck@eia.be> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
aca7a3acb1
commit
9118f08a77
1 changed files with 6 additions and 15 deletions
|
@ -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(®->chl[TRANSMIT_CHL].id0, id);
|
||||
if (id & CAN_RTR_FLAG)
|
||||
writew(((id & 0x1FFF0000) >> 16) | IDE | AME | RTR,
|
||||
®->chl[TRANSMIT_CHL].id1);
|
||||
else
|
||||
writew(((id & 0x1FFF0000) >> 16) | IDE | AME,
|
||||
®->chl[TRANSMIT_CHL].id1);
|
||||
|
||||
} else {
|
||||
if (id & CAN_RTR_FLAG)
|
||||
writew((id << 2) | AME | RTR,
|
||||
®->chl[TRANSMIT_CHL].id1);
|
||||
else
|
||||
bfin_write16(®->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(®->chl[TRANSMIT_CHL].id1, val | AME);
|
||||
|
||||
/* fill payload */
|
||||
for (i = 0; i < 8; i += 2) {
|
||||
|
|
Reference in a new issue