summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorMao Wenan <maowenan@huawei.com>2019-12-09 21:08:45 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-02-24 08:34:40 +0100
commitec0237cb3621974af9ffe5aef452d1dbc4103ef8 (patch)
treeb99c2a9ddba9ddd78d9670741e3d2c58fb7ba1c1 /drivers/nfc
parent354704ede9b6a193adfe87a915d578976dfedd97 (diff)
downloadlinux-stable-ec0237cb3621974af9ffe5aef452d1dbc4103ef8.tar.gz
linux-stable-ec0237cb3621974af9ffe5aef452d1dbc4103ef8.tar.bz2
linux-stable-ec0237cb3621974af9ffe5aef452d1dbc4103ef8.zip
NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu().
[ Upstream commit 718eae277e62a26e5862eb72a830b5e0fe37b04a ] Convert cpu_to_le16(le16_to_cpu(frame->datalen) + len) to use le16_add_cpu(), which is more concise and does the same thing. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Mao Wenan <maowenan@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/port100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c
index 60ae382f50da..06bb226c62ef 100644
--- a/drivers/nfc/port100.c
+++ b/drivers/nfc/port100.c
@@ -574,7 +574,7 @@ static void port100_tx_update_payload_len(void *_frame, int len)
{
struct port100_frame *frame = _frame;
- frame->datalen = cpu_to_le16(le16_to_cpu(frame->datalen) + len);
+ le16_add_cpu(&frame->datalen, len);
}
static bool port100_rx_frame_is_valid(void *_frame)