From patchwork Fri Sep 11 05:48:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 46806 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8B5mG45000791 for ; Fri, 11 Sep 2009 05:48:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752012AbZIKFsQ (ORCPT ); Fri, 11 Sep 2009 01:48:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752015AbZIKFsQ (ORCPT ); Fri, 11 Sep 2009 01:48:16 -0400 Received: from mail-px0-f189.google.com ([209.85.216.189]:43458 "EHLO mail-px0-f189.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752012AbZIKFsQ (ORCPT ); Fri, 11 Sep 2009 01:48:16 -0400 Received: by mail-px0-f189.google.com with SMTP id 27so621346pxi.15 for ; Thu, 10 Sep 2009 22:48:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:subject:to:cc:date :message-id:in-reply-to:references:user-agent:mime-version :content-type:content-transfer-encoding; bh=ggh5Kcv25cpVKUMIG1YT9f2rphFZKWTQlLLjh8s5K4M=; b=lc2czhc0R/RUk/EC3bDZSCF/twnCwTm+wqlvneioV++LVdSdj88kDpb+z1ul0An4sk 70IVN7Oiamg4sg55YRcF0VUJyPuci22nQ1ZzBq3X1BpXvCStYh/xJaPFHjmqNHAiHcGl qOGUilf3VwjgzTPeq0ps78LrJS5AlKC819RTo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; b=oFoBw98h/7pN94Y6JaSnYkHLJaP2eVRHitY4uCflTyWr+NCfAq8ZSxOjF5irhLvubb 54fLYgvPgdUP6bu+lfP573c/oZY8l4TzSCtgMgQ+1UPLIxoS7eQfTN5ovag//J3B8fLN fqD4juMIG6tdgpCPY4062RvHb/bDdMr9mNFGI= Received: by 10.114.250.9 with SMTP id x9mr2733712wah.226.1252648099548; Thu, 10 Sep 2009 22:48:19 -0700 (PDT) Received: from mailhub.coreip.homeip.net (c-24-6-153-137.hsd1.ca.comcast.net [24.6.153.137]) by mx.google.com with ESMTPS id 22sm2128757pzk.14.2009.09.10.22.48.18 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 10 Sep 2009 22:48:19 -0700 (PDT) From: Dmitry Torokhov Subject: [PATCH 3/3] Input: atkbd - rely on input core to restore state on resume To: linux-input@vger.kernel.org Cc: rjw@sisk.pl Date: Thu, 10 Sep 2009 22:48:17 -0700 Message-ID: <20090911054817.27150.36441.stgit@localhost.localdomain> In-Reply-To: <20090911054210.27150.93405.stgit@localhost.localdomain> References: <20090911054210.27150.93405.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Now that input core takes care of restoring state of input devices upon resume we don't need to do anything special here. Signed-off-by: Dmitry Torokhov --- drivers/input/keyboard/atkbd.c | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index c9523e4..904d4c9 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c @@ -773,23 +773,6 @@ static int atkbd_select_set(struct atkbd *atkbd, int target_set, int allow_extra static int atkbd_activate(struct atkbd *atkbd) { struct ps2dev *ps2dev = &atkbd->ps2dev; - unsigned char param[1]; - -/* - * Set the LEDs to a defined state. - */ - - param[0] = 0; - if (ps2_command(ps2dev, param, ATKBD_CMD_SETLEDS)) - return -1; - -/* - * Set autorepeat to fastest possible. - */ - - param[0] = 0; - if (ps2_command(ps2dev, param, ATKBD_CMD_SETREP)) - return -1; /* * Enable the keyboard to receive keystrokes. @@ -1158,14 +1141,6 @@ static int atkbd_reconnect(struct serio *serio) return -1; atkbd_activate(atkbd); - -/* - * Restore repeat rate and LEDs (that were reset by atkbd_activate) - * to pre-resume state - */ - if (!atkbd->softrepeat) - atkbd_set_repeat_rate(atkbd); - atkbd_set_leds(atkbd); } atkbd_enable(atkbd);