Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 255353
b: refs/heads/master
c: 9c2e0a6
h: refs/heads/master
i:
  255351: 7cbc909
v: v3
  • Loading branch information
Marc Kleine-Budde committed Jun 6, 2011
1 parent c38663b commit 6cd0d3e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e14ee40bece891b5edccdd514112999ec423a448
refs/heads/master: 9c2e0a6d2f7b7c76e0cbc42a8da99fd732f0fdfa
6 changes: 3 additions & 3 deletions trunk/drivers/net/can/at91_can.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 6cd0d3e

Please sign in to comment.