From patchwork Thu Feb 13 05:27:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 3642741 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A71A09F1EE for ; Thu, 13 Feb 2014 05:32:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D355B20145 for ; Thu, 13 Feb 2014 05:32:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B29CE20158 for ; Thu, 13 Feb 2014 05:32:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753497AbaBMFcE (ORCPT ); Thu, 13 Feb 2014 00:32:04 -0500 Received: from mail-pd0-f175.google.com ([209.85.192.175]:35130 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752246AbaBMF2F (ORCPT ); Thu, 13 Feb 2014 00:28:05 -0500 Received: by mail-pd0-f175.google.com with SMTP id w10so10010356pde.34 for ; Wed, 12 Feb 2014 21:28:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4Yly7788hJm1vi7y1G5A+TB4ykJE022eazQoUgwhgF0=; b=vc9zMJb+YmUJCiaVzraeELu6ArrCirsvGZsuRHDyduXiOzesehw077bS9k/6SOMNf/ QymunsFmE7t8/txDjj9BANEToqd/jbhDiqX5AV5HWwXS1peej/3O6NHpn68iRdEnHaxc 29MoxSCVcWOYat+cXFBCWyVg0OdDpTEi2zRP/nEeOpJq9TbaBBEba96N55wvn4TEVWnB aLzpG1pvhliTt+zHb1ZYdRrkLELmfLyhS/m1dFnh5wDm17OVw6Nc+IrbbMMZtfshqUBh k1tO0mr6wEcCmFoIdK3eacv6g+q5v3Z/jQltDICnFoNG2zbmBbuzcBC0gmHvlSiR8Q+G dc6g== X-Received: by 10.68.40.138 with SMTP id x10mr55981510pbk.8.1392269284696; Wed, 12 Feb 2014 21:28:04 -0800 (PST) Received: from mailhub.coreip.homeip.net (c-67-188-112-76.hsd1.ca.comcast.net. [67.188.112.76]) by mx.google.com with ESMTPSA id un5sm5597682pab.3.2014.02.12.21.28.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 12 Feb 2014 21:28:04 -0800 (PST) From: Dmitry Torokhov To: Christopher Heiny Cc: Andrew Duggan , Vincent Huang , Vivian Ly , Daniel Rosenberg , Linus Walleij , Benjamin Tissoires , Courtney Cavin , Linux Input , Linux Kernel Subject: [PATCH 03/11] Input: synaptics-rmi4 - do not update configuration in rmi_f01_probe() Date: Wed, 12 Feb 2014 21:27:49 -0800 Message-Id: <1392269277-16391-3-git-send-email-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392269277-16391-1-git-send-email-dmitry.torokhov@gmail.com> References: <1392269277-16391-1-git-send-email-dmitry.torokhov@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Do not write configuration data in probe(), we have config() for that. Signed-off-by: Dmitry Torokhov Signed-off-by: Christopher Heiny --- drivers/input/rmi4/rmi_f01.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c index 897d8ac..976aba3 100644 --- a/drivers/input/rmi4/rmi_f01.c +++ b/drivers/input/rmi4/rmi_f01.c @@ -303,12 +303,6 @@ static int rmi_f01_initialize(struct rmi_function *fn) if (pdata->power_management.doze_interval) { data->device_control.doze_interval = pdata->power_management.doze_interval; - error = rmi_write(rmi_dev, data->doze_interval_addr, - data->device_control.doze_interval); - if (error < 0) { - dev_err(&fn->dev, "Failed to configure F01 doze interval register.\n"); - return error; - } } else { error = rmi_read(rmi_dev, data->doze_interval_addr, &data->device_control.doze_interval); @@ -324,12 +318,6 @@ static int rmi_f01_initialize(struct rmi_function *fn) if (pdata->power_management.wakeup_threshold) { data->device_control.wakeup_threshold = pdata->power_management.wakeup_threshold; - error = rmi_write(rmi_dev, data->wakeup_threshold_addr, - data->device_control.wakeup_threshold); - if (error < 0) { - dev_err(&fn->dev, "Failed to configure F01 wakeup threshold register.\n"); - return error; - } } else { error = rmi_read(rmi_dev, data->wakeup_threshold_addr, &data->device_control.wakeup_threshold); @@ -347,12 +335,6 @@ static int rmi_f01_initialize(struct rmi_function *fn) if (pdata->power_management.doze_holdoff) { data->device_control.doze_holdoff = pdata->power_management.doze_holdoff; - error = rmi_write(rmi_dev, data->doze_holdoff_addr, - data->device_control.doze_holdoff); - if (error < 0) { - dev_err(&fn->dev, "Failed to configure F01 doze holdoff register.\n"); - return error; - } } else { error = rmi_read(rmi_dev, data->doze_holdoff_addr, &data->device_control.doze_holdoff);