From patchwork Thu May 19 01:23:02 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: 9123421 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 23A21BF29F for ; Thu, 19 May 2016 01:23:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 121072022D for ; Thu, 19 May 2016 01:23:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4E892022A for ; Thu, 19 May 2016 01:23:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752023AbcESBXS (ORCPT ); Wed, 18 May 2016 21:23:18 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36547 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbcESBXR (ORCPT ); Wed, 18 May 2016 21:23:17 -0400 Received: by mail-wm0-f66.google.com with SMTP id w143so17026281wmw.3 for ; Wed, 18 May 2016 18:23:17 -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:mime-version :content-transfer-encoding; bh=HBr8pD1GoCD+/YyNYvWOvzs54Gb66Y6Wue0OyAb6Dkw=; b=VHQMJzzkFJOSzQTD7NGLeOe9MZeqUBhNSMPJVY/N/ybStTCzXCrcif1ooB9j2HSAts CmVIQceYTvOcd5s/KnShBZa1zWI5nr2QdfTdbsqncToTodwweTJSxpFpH1/DLLDj4LDR Mas1J+9zNhOQbqQDBvoLVBA4A/t8HecSuC34hn5CIz5ancIk5/HHg3npjR2ZI1Nd30Jk uLgJGlldYTZD0+vTY9bP/o5VhXKqJUwXxXWMgJtIqf9DctSFMkQ6VQZtF2l7RUfD0BUG 10hN0kvyG0BvEqP9klN5ewB6lBk4WVujmacpLkWN8RU3XCs1ecNHE6c7wwAWAwoVTDsX UYfg== X-Gm-Message-State: AOPr4FWYHU8vcSEDvMdSUyr/K4CACQB35JBweRHvoIFAIOW+bOygkWJuNpDxTEY3wzhdiw== X-Received: by 10.28.57.137 with SMTP id g131mr11067750wma.5.1463620996152; Wed, 18 May 2016 18:23:16 -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 c85sm395417wmd.0.2016.05.18.18.23.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 May 2016 18:23:14 -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] thinkpad_acpi: save kbdlight state on suspend and restore it on resume Date: Thu, 19 May 2016 03:23:02 +0200 Message-Id: <1463620982-21058-1-git-send-email-mail@3v1n0.net> X-Mailer: git-send-email 1.9.1 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-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 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 --- 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, };