From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6780C2BA83 for ; Fri, 14 Feb 2020 18:13:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9FC032187F for ; Fri, 14 Feb 2020 18:13:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581704011; bh=zLAaDFzj2bwYv+0kiJhndvoOAmSRnnLJlpove3CrpdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=k4SDT+HsjZyvFTu4euK55NRTq4g4kldC5aBpw41E1u10eE8BfB22mMT7wy3FpmQBf DcoWcET97TsWXXKNHmssmQ1Q9YLknUmEYfiXKme0U+Va1sT6bXnc1mwBjkZUbLlaZR G1Gypg0xXCIjURCFpPZL5JjkkzjA6WHDDG6reoxw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393441AbgBNSN0 (ORCPT ); Fri, 14 Feb 2020 13:13:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:59644 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731068AbgBNPws (ORCPT ); Fri, 14 Feb 2020 10:52:48 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8375C24673; Fri, 14 Feb 2020 15:52:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581695568; bh=zLAaDFzj2bwYv+0kiJhndvoOAmSRnnLJlpove3CrpdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0WIvZkA/BCKNSkun/7VgsI1TSUcE57rjbStq5RalKLTiBPcXstdsdIo0gP5bva5y7 PMyXWoUn99caejz9gRLQLhIxhXK3iTVySNxrCAW9gIGojLKvvExv1P7PBpjySjfHZn mT4q9d9sDzwD8+Tz/i9YenN2JoN4ARQW6N22lSDc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mao Wenan , Hulk Robot , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 180/542] NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu(). Date: Fri, 14 Feb 2020 10:42:52 -0500 Message-Id: <20200214154854.6746-180-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214154854.6746-1-sashal@kernel.org> References: <20200214154854.6746-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mao Wenan [ 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 Signed-off-by: Mao Wenan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/nfc/port100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c index 604dba4f18afd..8e4d355dc3aec 100644 --- a/drivers/nfc/port100.c +++ b/drivers/nfc/port100.c @@ -565,7 +565,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) -- 2.20.1