| Message ID | 1308925982-14645-1-git-send-email-vapier@gentoo.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 06/24/2011 04:33 PM, Mike Frysinger wrote: > 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> Thanks, Wolfgang, -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jun 24, 2011 at 10:33:01AM -0400, Mike Frysinger wrote: > 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> Nice cleanup. Acked-by: Kurt Van Dijck <kurt.van.dijck@eia.be> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Kurt Van Dijck <kurt.van.dijck@eia.be> Date: Mon, 27 Jun 2011 09:43:55 +0200 > On Fri, Jun 24, 2011 at 10:33:01AM -0400, Mike Frysinger wrote: >> 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> > > Nice cleanup. > Acked-by: Kurt Van Dijck <kurt.van.dijck@eia.be> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c index b6e890d..dc6ef4a 100644 --- a/drivers/net/can/bfin_can.c +++ b/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(®->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) {
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> --- drivers/net/can/bfin_can.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-)