From patchwork Sat Mar 25 06:00:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 9644419 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8C39760328 for ; Sat, 25 Mar 2017 06:01:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C34C269A3 for ; Sat, 25 Mar 2017 06:01:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70FE026E48; Sat, 25 Mar 2017 06:01:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13954269DA for ; Sat, 25 Mar 2017 06:01:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967641AbdCYGBL (ORCPT ); Sat, 25 Mar 2017 02:01:11 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35383 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967364AbdCYGA4 (ORCPT ); Sat, 25 Mar 2017 02:00:56 -0400 Received: by mail-pf0-f196.google.com with SMTP id n11so1500816pfg.2; Fri, 24 Mar 2017 23:00:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3zKahr5P1G6WMYEObbQusZQkhrQ4BJ6G61Tk7Hu8/D0=; b=kyEx25ixc4W3azr2aGcOSjZcROQsCAlFghXiqDGTVahK2/HM0nZBmGSYGwMaJ+aG91 8+fjkHj6BnPHGHlq6UoKSwDqhI5hHPJa7g7KjSUP9oqy1pmV1AY1z3LfYJ58XZqqUftt 7GHHrxxyPSNP8KURERniiNvTQh0iiJBzeZF3y+LQzKHD+I5Uj+O+g71xcUzfXGqaGr6D phogflrFKsjsRIVOtRcVUhBxWCHijYxVhKAU5IzvWo4D32f4MpWx5tS328hdXYHsyPr7 FOxBW+PDNhwsoPzxc03at/DmdLsbthQSF5lqcV8aT9GM5zpUhtp0bghygrA7XvJ2UKz0 jQ7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3zKahr5P1G6WMYEObbQusZQkhrQ4BJ6G61Tk7Hu8/D0=; b=pAHHZA4SfCawrknp6bF8iP3uwIG7IAT0hBrNmmUhf7b+2Qw8KYdZvpMtMMTojPlhKD XPs/ICfR9+whH0eRnuqiUfucXWyo9LFkfnkt+77cLVJ/Begtv+vUdpmaM44Nmlki8q14 k1F1XuRYr7VSur7bA8gR34sdoAHyF81YqM+k9ouWfXHiWIw3f2FHUVTGWCQRr+k7fSYk cVhfXoD/Ws/AHUlv2OFUeYOjnp7sQcOzdh0lzaZN4ktklFy1wV5hCepzoMguaBg/AZzh h+uO5+exeR9pp1ShbU8sjmfsokewLyHhmPf2ILHAf7hlP6zkcmcqqlIASlQ7BLtyyitp uiQw== X-Gm-Message-State: AFeK/H3e57/KnE1+SM1wKmkom+lGZcxvlb38M1MycbseDV+F3Vardqxyn9VzT24AdbH3YQ== X-Received: by 10.98.204.195 with SMTP id j64mr13332244pfk.213.1490421655195; Fri, 24 Mar 2017 23:00:55 -0700 (PDT) Received: from dtor-ws.mtv.corp.google.com ([172.22.152.34]) by smtp.gmail.com with ESMTPSA id b128sm7916225pfg.54.2017.03.24.23.00.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Mar 2017 23:00:54 -0700 (PDT) From: Dmitry Torokhov To: Benjamin Tissoires , Andrew Duggan Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Nick Dyer Subject: [PATCH 3/4] Input: synaptics-rmi4 - cleanup SMbus mapping handling Date: Fri, 24 Mar 2017 23:00:49 -0700 Message-Id: <20170325060050.39867-3-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.12.1.578.ge9c3154ca4-goog In-Reply-To: <20170325060050.39867-1-dmitry.torokhov@gmail.com> References: <20170325060050.39867-1-dmitry.torokhov@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is no reason to copy structures field-by-filed when we can copy eements at once. Signed-off-by: Dmitry Torokhov Reviewed-by: Benjamin Tissoires --- drivers/input/rmi4/rmi_smbus.c | 43 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c index c8bf49686460..724643bf31a6 100644 --- a/drivers/input/rmi4/rmi_smbus.c +++ b/drivers/input/rmi4/rmi_smbus.c @@ -83,62 +83,55 @@ static int rmi_smb_get_command_code(struct rmi_transport_dev *xport, { struct rmi_smb_xport *rmi_smb = container_of(xport, struct rmi_smb_xport, xport); + struct mapping_table_entry new_map; int i; - int retval; - struct mapping_table_entry mapping_data[1]; + int retval = 0; mutex_lock(&rmi_smb->mappingtable_mutex); + for (i = 0; i < RMI_SMB2_MAP_SIZE; i++) { struct mapping_table_entry *entry = &rmi_smb->mapping_table[i]; if (le16_to_cpu(entry->rmiaddr) == rmiaddr) { if (isread) { - if (entry->readcount == bytecount) { - *commandcode = i; - retval = 0; + if (entry->readcount == bytecount) goto exit; - } } else { if (entry->flags & RMI_SMB2_MAP_FLAGS_WE) { - *commandcode = i; - retval = 0; goto exit; } } } } + i = rmi_smb->table_index; rmi_smb->table_index = (i + 1) % RMI_SMB2_MAP_SIZE; /* constructs mapping table data entry. 4 bytes each entry */ - memset(mapping_data, 0, sizeof(mapping_data)); - - mapping_data[0].rmiaddr = cpu_to_le16(rmiaddr); - mapping_data[0].readcount = bytecount; - mapping_data[0].flags = !isread ? RMI_SMB2_MAP_FLAGS_WE : 0; - - retval = smb_block_write(xport, i + 0x80, mapping_data, - sizeof(mapping_data)); + memset(&new_map, 0, sizeof(new_map)); + new_map.rmiaddr = cpu_to_le16(rmiaddr); + new_map.readcount = bytecount; + new_map.flags = !isread ? RMI_SMB2_MAP_FLAGS_WE : 0; + retval = smb_block_write(xport, i + 0x80, &new_map, sizeof(new_map)); if (retval < 0) { /* * if not written to device mapping table * clear the driver mapping table records */ - rmi_smb->mapping_table[i].rmiaddr = 0x0000; - rmi_smb->mapping_table[i].readcount = 0; - rmi_smb->mapping_table[i].flags = 0; - goto exit; + memset(&new_map, 0, sizeof(new_map)); } + /* save to the driver level mapping table */ - rmi_smb->mapping_table[i].rmiaddr = rmiaddr; - rmi_smb->mapping_table[i].readcount = bytecount; - rmi_smb->mapping_table[i].flags = !isread ? RMI_SMB2_MAP_FLAGS_WE : 0; - *commandcode = i; + rmi_smb->mapping_table[i] = new_map; exit: mutex_unlock(&rmi_smb->mappingtable_mutex); - return retval; + if (retval < 0) + return retval; + + *commandcode = i; + return 0; } static int rmi_smb_write_block(struct rmi_transport_dev *xport, u16 rmiaddr,