From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Kurtz Subject: [PATCH 15/20] Input: atmel_mxt_ts - optimize writing of object table entries Date: Tue, 13 Mar 2012 20:04:18 +0800 Message-ID: <1331640263-18935-16-git-send-email-djkurtz@chromium.org> References: <1331640263-18935-1-git-send-email-djkurtz@chromium.org> Return-path: Received: from mail-ey0-f202.google.com ([209.85.215.202]:39935 "EHLO mail-ey0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757425Ab2CMMKZ (ORCPT ); Tue, 13 Mar 2012 08:10:25 -0400 Received: by eaaq10 with SMTP id q10so24337eaa.1 for ; Tue, 13 Mar 2012 05:10:24 -0700 (PDT) In-Reply-To: <1331640263-18935-1-git-send-email-djkurtz@chromium.org> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Dmitry Torokhov , Joonyoung Shim , Iiro Valkonen , Henrik Rydberg , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Benson Leung , Yufeng Shen , Daniel Kurtz Write each object using a single bulk i2c write transfer. Signed-off-by: Daniel Kurtz --- drivers/input/touchscreen/atmel_mxt_ts.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 9e1ce03..0277381 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -609,33 +609,33 @@ end: static int mxt_check_reg_init(struct mxt_data *data) { const struct mxt_platform_data *pdata = data->pdata; - struct mxt_object *object; struct device *dev = &data->client->dev; - int index = 0; - int i, j, config_offset, config_size; + int i, offset; + int ret; if (!pdata->config) { dev_dbg(dev, "No cfg data defined, skipping reg init\n"); return 0; } - for (i = 0; i < data->info.object_num; i++) { - object = data->object_table + i; + for (offset = 0, i = 0; i < data->info.object_num; i++) { + struct mxt_object *object = &data->object_table[i]; + size_t config_size; if (!mxt_object_writable(object->type)) continue; config_size = object->size * object->instances; - for (j = 0; j < config_size; j++) { - config_offset = index + j; - if (config_offset > pdata->config_length) { - dev_err(dev, "Not enough config data!\n"); - return -EINVAL; - } - mxt_write_object(data, object->type, j, - pdata->config[config_offset]); + if (offset + config_size > pdata->config_length) { + dev_err(dev, "Not enough config data!\n"); + return -EINVAL; } - index += config_size; + + ret = mxt_write_reg(data->client, object->start_address, + config_size, &pdata->config[offset]); + if (ret) + return ret; + offset += config_size; } return 0; -- 1.7.7.3