From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2] net: usb: hso: use swap macro in hso_kick_transmit From: "Gustavo A. R. Silva" Message-Id: <20180712194320.GA26098@embeddedor.com> Date: Thu, 12 Jul 2018 14:43:20 -0500 To: "David S. Miller" Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" List-ID: TWFrZSB1c2Ugb2YgdGhlIHN3YXAgbWFjcm8gYW5kIHJlbW92ZSB1bm5lY2Vzc2FyeSB2YXJpYWJs ZSAqdGVtcCouClRoaXMgbWFrZXMgdGhlIGNvZGUgZWFzaWVyIHRvIHJlYWQgYW5kIG1haW50YWlu LiBBbHNvLCBzbGlnaHRseQpyZWZhY3RvciBzb21lIGNvZGUgZHVlIHRvIHRoZSByZW1vdmFsIG9m ICp0ZW1wKi4KClRoaXMgY29kZSB3YXMgZGV0ZWN0ZWQgd2l0aCB0aGUgaGVscCBvZiBDb2NjaW5l bGxlLgoKU2lnbmVkLW9mZi1ieTogR3VzdGF2byBBLiBSLiBTaWx2YSA8Z3VzdGF2b0BlbWJlZGRl ZG9yLmNvbT4KLS0tCkNoYW5nZXMgaW4gdjI6CiAtIENoZWNrIHNlcmlhbC0+dHhfZGF0YSBpbnN0 ZWFkIG9mIHRlbXAuCgogZHJpdmVycy9uZXQvdXNiL2hzby5jIHwgOSArKystLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9uZXQvdXNiL2hzby5jIGIvZHJpdmVycy9uZXQvdXNiL2hzby5jCmluZGV4IGRlMzA1 ZWEuLjE4NGMyNGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbmV0L3VzYi9oc28uYworKysgYi9kcml2 ZXJzL25ldC91c2IvaHNvLmMKQEAgLTE3MzIsNyArMTczMiw2IEBAIHN0YXRpYyBpbnQgaHNvX3Nl cmlhbF9pb2N0bChzdHJ1Y3QgdHR5X3N0cnVjdCAqdHR5LAogLyogc3RhcnRzIGEgdHJhbnNtaXQg Ki8KIHN0YXRpYyB2b2lkIGhzb19raWNrX3RyYW5zbWl0KHN0cnVjdCBoc29fc2VyaWFsICpzZXJp YWwpCiB7Ci0JdTggKnRlbXA7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAlpbnQgcmVzOwogCkBA IC0xNzQ4LDE0ICsxNzQ3LDEyIEBAIHN0YXRpYyB2b2lkIGhzb19raWNrX3RyYW5zbWl0KHN0cnVj dCBoc29fc2VyaWFsICpzZXJpYWwpCiAJCWdvdG8gb3V0OwogCiAJLyogU3dpdGNoIHBvaW50ZXJz IGFyb3VuZCB0byBhdm9pZCBtZW1jcHkgKi8KLQl0ZW1wID0gc2VyaWFsLT50eF9idWZmZXI7Ci0J c2VyaWFsLT50eF9idWZmZXIgPSBzZXJpYWwtPnR4X2RhdGE7Ci0Jc2VyaWFsLT50eF9kYXRhID0g dGVtcDsKKwlzd2FwKHNlcmlhbC0+dHhfYnVmZmVyLCBzZXJpYWwtPnR4X2RhdGEpOwogCXNlcmlh bC0+dHhfZGF0YV9jb3VudCA9IHNlcmlhbC0+dHhfYnVmZmVyX2NvdW50OwogCXNlcmlhbC0+dHhf YnVmZmVyX2NvdW50ID0gMDsKIAotCS8qIElmIHRlbXAgaXMgc2V0LCBpdCBtZWFucyB3ZSBzd2l0 Y2hlZCBidWZmZXJzICovCi0JaWYgKHRlbXAgJiYgc2VyaWFsLT53cml0ZV9kYXRhKSB7CisJLyog SWYgc2VyaWFsLT50eF9kYXRhIGlzIHNldCwgaXQgbWVhbnMgd2Ugc3dpdGNoZWQgYnVmZmVycyAq LworCWlmIChzZXJpYWwtPnR4X2RhdGEgJiYgc2VyaWFsLT53cml0ZV9kYXRhKSB7CiAJCXJlcyA9 IHNlcmlhbC0+d3JpdGVfZGF0YShzZXJpYWwpOwogCQlpZiAocmVzID49IDApCiAJCQlzZXJpYWwt PnR4X3VyYl91c2VkID0gMTsK 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=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT 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 86678ECDFAA for ; Thu, 12 Jul 2018 19:43:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EC0720846 for ; Thu, 12 Jul 2018 19:43:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3EC0720846 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=embeddedor.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732413AbeGLTyn (ORCPT ); Thu, 12 Jul 2018 15:54:43 -0400 Received: from gateway21.websitewelcome.com ([192.185.45.89]:42016 "EHLO gateway21.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728250AbeGLTyn (ORCPT ); Thu, 12 Jul 2018 15:54:43 -0400 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway21.websitewelcome.com (Postfix) with ESMTP id AE777400CEBB0 for ; Thu, 12 Jul 2018 14:43:42 -0500 (CDT) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id dhUnfNw4caSeydhV0f0typ; Thu, 12 Jul 2018 14:43:42 -0500 X-Authority-Reason: nr=8 Received: from [189.250.65.56] (port=40604 helo=embeddedor) by gator4166.hostgator.com with esmtpa (Exim 4.91) (envelope-from ) id 1fdhUn-000iD6-1f; Thu, 12 Jul 2018 14:43:21 -0500 Date: Thu, 12 Jul 2018 14:43:20 -0500 From: "Gustavo A. R. Silva" To: "David S. Miller" Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" Subject: [PATCH v2] net: usb: hso: use swap macro in hso_kick_transmit Message-ID: <20180712194320.GA26098@embeddedor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.250.65.56 X-Source-L: No X-Exim-ID: 1fdhUn-000iD6-1f X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedor) [189.250.65.56]:40604 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 8 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make use of the swap macro and remove unnecessary variable *temp*. This makes the code easier to read and maintain. Also, slightly refactor some code due to the removal of *temp*. This code was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva --- Changes in v2: - Check serial->tx_data instead of temp. drivers/net/usb/hso.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index de305ea..184c24b 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -1732,7 +1732,6 @@ static int hso_serial_ioctl(struct tty_struct *tty, /* starts a transmit */ static void hso_kick_transmit(struct hso_serial *serial) { - u8 *temp; unsigned long flags; int res; @@ -1748,14 +1747,12 @@ static void hso_kick_transmit(struct hso_serial *serial) goto out; /* Switch pointers around to avoid memcpy */ - temp = serial->tx_buffer; - serial->tx_buffer = serial->tx_data; - serial->tx_data = temp; + swap(serial->tx_buffer, serial->tx_data); serial->tx_data_count = serial->tx_buffer_count; serial->tx_buffer_count = 0; - /* If temp is set, it means we switched buffers */ - if (temp && serial->write_data) { + /* If serial->tx_data is set, it means we switched buffers */ + if (serial->tx_data && serial->write_data) { res = serial->write_data(serial); if (res >= 0) serial->tx_urb_used = 1; -- 2.7.4