Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753546AbaBMFcF (ORCPT ); Thu, 13 Feb 2014 00:32:05 -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 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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Do not write configuration data in probe(), we have config() for that. Signed-off-by: Dmitry Torokhov --- 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); -- 1.8.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/