From patchwork Mon May 23 22:39:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marco_Trevisan_=28Trevi=C3=B1o=29?= X-Patchwork-Id: 9132469 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 D2752607D3 for ; Mon, 23 May 2016 22:40:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C755528238 for ; Mon, 23 May 2016 22:40:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B842D2824F; Mon, 23 May 2016 22:40:15 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 182D428238 for ; Mon, 23 May 2016 22:40:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751242AbcEWWkN (ORCPT ); Mon, 23 May 2016 18:40:13 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36583 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888AbcEWWkM (ORCPT ); Mon, 23 May 2016 18:40:12 -0400 Received: by mail-wm0-f66.google.com with SMTP id q62so716857wmg.3 for ; Mon, 23 May 2016 15:40:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oSUz3Ki1h64s+u8S+4EqbjQO6krRr3FpWnpn2roy+vk=; b=SX4oiiQgZBFVs7hZaqmE2nZn6t+jlYkeL16B7e3QOQf9RocY7E4IEnxLLSRy5lvaCi ANUhx/DDys/zezDuPs/pn1chEQ2Ptev51HAPW6Jq771RedRFmpfzIBHGyK2zoPrT7CJo UPusrs8l/y3ix6f3etPXGgxzDy61xTFJCZEaBVq76ExoTk0dIysth/DOphrn5TCL1ju2 z+xYKSP7PXjZac/vj66Uz6Y1HIOaT42guoaJ2CjkQmfd7R8B5PcwtRDKVd8nJTv4I8qG +6/bih1xLHL+az3yewDVacJecQJhSDySHNDM36spNLJwMawF2rK3VeVoECV+Yi0zYWxW TEnA== X-Gm-Message-State: ALyK8tL0gJc40fh6ujuNgzpTIDsLqSnXFWf3QncE8zhJy6Hnfek/XKzZ9TNHmtS19UO4RA== X-Received: by 10.194.133.98 with SMTP id pb2mr971599wjb.144.1464043211371; Mon, 23 May 2016 15:40:11 -0700 (PDT) Received: from tricky.station (net-93-71-205-220.cust.vodafonedsl.it. [93.71.205.220]) by smtp.gmail.com with ESMTPSA id a63sm354752wmh.11.2016.05.23.15.40.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 May 2016 15:40:10 -0700 (PDT) From: Marco Trevisan To: platform-driver-x86@vger.kernel.org Cc: Henrique de Moraes Holschuh , Darren Hart , =?UTF-8?q?Pali=20Roh=C3=A1r?= , =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Subject: [PATCH v2] thinkpad_acpi: save kbdlight state on suspend and restore it on resume Date: Tue, 24 May 2016 00:39:51 +0200 Message-Id: <1464043191-20791-1-git-send-email-mail@3v1n0.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1463620982-21058-1-git-send-email-mail@3v1n0.net> References: <1463620982-21058-1-git-send-email-mail@3v1n0.net> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marco Trevisan (Treviño) Override default LED class suspend/resume handles, by keeping track of the brightness level before suspending so that it can be automatically restored on resume by calling default resume handler. Acked-by: Henrique de Moraes Holschuh Signed-off-by: Marco Trevisan (Treviño) --- drivers/platform/x86/thinkpad_acpi.c | 43 +++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 1f9783c..10111c2 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -5041,6 +5041,8 @@ static int kbdlight_set_level(int level) return 0; } +static int kbdlight_set_level_and_update(int level); + static int kbdlight_get_level(void) { int status = 0; @@ -5108,7 +5110,7 @@ static void kbdlight_set_worker(struct work_struct *work) container_of(work, struct tpacpi_led_classdev, work); if (likely(tpacpi_lifecycle == TPACPI_LIFE_RUNNING)) - kbdlight_set_level(data->new_state); + kbdlight_set_level_and_update(data->new_state); } static void kbdlight_sysfs_set(struct led_classdev *led_cdev, @@ -5139,7 +5141,6 @@ static struct tpacpi_led_classdev tpacpi_led_kbdlight = { .max_brightness = 2, .brightness_set = &kbdlight_sysfs_set, .brightness_get = &kbdlight_sysfs_get, - .flags = LED_CORE_SUSPENDRESUME, } }; @@ -5177,6 +5178,20 @@ static void kbdlight_exit(void) flush_workqueue(tpacpi_wq); } +static int kbdlight_set_level_and_update(int level) +{ + int ret; + struct led_classdev *led_cdev; + + ret = kbdlight_set_level(level); + led_cdev = &tpacpi_led_kbdlight.led_classdev; + + if (ret == 0 && !(led_cdev->flags & LED_SUSPENDED)) + led_cdev->brightness = level; + + return ret; +} + static int kbdlight_read(struct seq_file *m) { int level; @@ -5217,13 +5232,35 @@ static int kbdlight_write(char *buf) if (level == -1) return -EINVAL; - return kbdlight_set_level(level); + return kbdlight_set_level_and_update(level); +} + +static void kbdlight_suspend(void) +{ + struct led_classdev *led_cdev; + + if (!tp_features.kbdlight) + return; + + led_cdev = &tpacpi_led_kbdlight.led_classdev; + led_update_brightness(led_cdev); + led_classdev_suspend(led_cdev); +} + +static void kbdlight_resume(void) +{ + if (!tp_features.kbdlight) + return; + + led_classdev_resume(&tpacpi_led_kbdlight.led_classdev); } static struct ibm_struct kbdlight_driver_data = { .name = "kbdlight", .read = kbdlight_read, .write = kbdlight_write, + .suspend = kbdlight_suspend, + .resume = kbdlight_resume, .exit = kbdlight_exit, };