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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 75A92C35641 for ; Fri, 21 Feb 2020 07:50:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D9C7207FD for ; Fri, 21 Feb 2020 07:50:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271422; bh=zLAaDFzj2bwYv+0kiJhndvoOAmSRnnLJlpove3CrpdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O8HQm9ckKKviiXod8LLsOtGJXMi0JUGbpnrzrLjQYYRu6X8SfMEM/OKq9NAlzBbR7 Arvg1Sokz+Nh2E2ck2vCn+fkU6s8C/K4mWQnVfJBfMqEnHXmITvCrm80l5miqUkKVk mpx/EGtPsybCCux6ecKNDhfrrVZcwJpBO6+NVzPM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729543AbgBUHuU (ORCPT ); Fri, 21 Feb 2020 02:50:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:47044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729509AbgBUHuN (ORCPT ); Fri, 21 Feb 2020 02:50:13 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7AFE6222C4; Fri, 21 Feb 2020 07:50:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271413; bh=zLAaDFzj2bwYv+0kiJhndvoOAmSRnnLJlpove3CrpdE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D+9kronc2u26Tx7VyWpe3Pbw3eh4GG37Rz7Bq0HJeddEXFdzyuVBltt+cwpeaxlq9 t5MlVA9NqdfDVzEs4oht/zo5BWO63fyp+bBiRFko4pUNSq8W+TqjQzNRB5kX3d+GDl Tv12Z/T/shsnvGtTDYrwTCoWliKF9VXATHsAEoCc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Mao Wenan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.5 118/399] NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu(). Date: Fri, 21 Feb 2020 08:37:23 +0100 Message-Id: <20200221072413.952969689@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072402.315346745@linuxfoundation.org> References: <20200221072402.315346745@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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