summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2019-08-02 12:14:54 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2020-02-09 22:38:56 +0100
commit93dafa86c0160be672dd02c1f83ebf448d0bd5e4 (patch)
tree5a930bfb02282ba4a1f62145a5bb88fe9eba5860
parent080210c765ebcd336e1d87798a04e9eeb103d62f (diff)
can: mcp25xxfd: mcp25xxfd_cmd_calc(): simplify function
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit 9aad623041c9f51dbbfdabdb06105c2418250a58)
-rw-r--r--drivers/net/can/spi/mcp25xxfd/mcp25xxfd_cmd.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_cmd.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_cmd.h
index 595b85294452..a60a14c4f3b7 100644
--- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_cmd.h
+++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_cmd.h
@@ -35,10 +35,10 @@ static inline void mcp25xxfd_cmd_convert_from_cpu(u32 *data, int n)
static inline void mcp25xxfd_cmd_calc(u16 cmd, u16 addr, u8 *data)
{
- cmd = cmd | (addr & MCP25XXFD_ADDRESS_MASK);
+ cmd |= addr & MCP25XXFD_ADDRESS_MASK;
- data[0] = (cmd >> 8) & 0xff;
- data[1] = (cmd >> 0) & 0xff;
+ data[0] = cmd >> 8;
+ data[1] = cmd;
}
static inline int mcp25xxfd_cmd_first_byte(u32 mask)