diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2011-05-03 11:47:55 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2011-06-06 05:00:10 -0400 |
commit | 9c2e0a6d2f7b7c76e0cbc42a8da99fd732f0fdfa (patch) | |
tree | 1b5a72644f39134d970ea48f0b0d2d2cf849eebc /drivers/net/can | |
parent | e14ee40bece891b5edccdd514112999ec423a448 (diff) |
can: at91_can: let get_tx_* functions return unsigned int
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
-rw-r--r-- | drivers/net/can/at91_can.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c index 5358d7059211..716f22bf3d2f 100644 --- a/drivers/net/can/at91_can.c +++ b/drivers/net/can/at91_can.c | |||
@@ -186,17 +186,17 @@ static struct can_bittiming_const at91_bittiming_const = { | |||
186 | .brp_inc = 1, | 186 | .brp_inc = 1, |
187 | }; | 187 | }; |
188 | 188 | ||
189 | static inline int get_tx_next_mb(const struct at91_priv *priv) | 189 | static inline unsigned int get_tx_next_mb(const struct at91_priv *priv) |
190 | { | 190 | { |
191 | return (priv->tx_next & AT91_NEXT_MB_MASK) + AT91_MB_TX_FIRST; | 191 | return (priv->tx_next & AT91_NEXT_MB_MASK) + AT91_MB_TX_FIRST; |
192 | } | 192 | } |
193 | 193 | ||
194 | static inline int get_tx_next_prio(const struct at91_priv *priv) | 194 | static inline unsigned int get_tx_next_prio(const struct at91_priv *priv) |
195 | { | 195 | { |
196 | return (priv->tx_next >> AT91_NEXT_PRIO_SHIFT) & 0xf; | 196 | return (priv->tx_next >> AT91_NEXT_PRIO_SHIFT) & 0xf; |
197 | } | 197 | } |
198 | 198 | ||
199 | static inline int get_tx_echo_mb(const struct at91_priv *priv) | 199 | static inline unsigned int get_tx_echo_mb(const struct at91_priv *priv) |
200 | { | 200 | { |
201 | return (priv->tx_echo & AT91_NEXT_MB_MASK) + AT91_MB_TX_FIRST; | 201 | return (priv->tx_echo & AT91_NEXT_MB_MASK) + AT91_MB_TX_FIRST; |
202 | } | 202 | } |