From 6cd0d3efee6771c46a405b30fa70a0d67720bfb5 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Tue, 3 May 2011 17:47:55 +0200 Subject: [PATCH] --- yaml --- r: 255353 b: refs/heads/master c: 9c2e0a6d2f7b7c76e0cbc42a8da99fd732f0fdfa h: refs/heads/master i: 255351: 7cbc909108314abf0af7c5354b17b1b745e8e605 v: v3 --- [refs] | 2 +- trunk/drivers/net/can/at91_can.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bc1b13205a30..ed384ffca9ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e14ee40bece891b5edccdd514112999ec423a448 +refs/heads/master: 9c2e0a6d2f7b7c76e0cbc42a8da99fd732f0fdfa diff --git a/trunk/drivers/net/can/at91_can.c b/trunk/drivers/net/can/at91_can.c index 5358d7059211..716f22bf3d2f 100644 --- a/trunk/drivers/net/can/at91_can.c +++ b/trunk/drivers/net/can/at91_can.c @@ -186,17 +186,17 @@ static struct can_bittiming_const at91_bittiming_const = { .brp_inc = 1, }; -static inline int get_tx_next_mb(const struct at91_priv *priv) +static inline unsigned int get_tx_next_mb(const struct at91_priv *priv) { return (priv->tx_next & AT91_NEXT_MB_MASK) + AT91_MB_TX_FIRST; } -static inline int get_tx_next_prio(const struct at91_priv *priv) +static inline unsigned int get_tx_next_prio(const struct at91_priv *priv) { return (priv->tx_next >> AT91_NEXT_PRIO_SHIFT) & 0xf; } -static inline int get_tx_echo_mb(const struct at91_priv *priv) +static inline unsigned int get_tx_echo_mb(const struct at91_priv *priv) { return (priv->tx_echo & AT91_NEXT_MB_MASK) + AT91_MB_TX_FIRST; }