From patchwork Fri Jan 31 14:36:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 11359999 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 52E5E1395 for ; Fri, 31 Jan 2020 14:37:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3102E214D8 for ; Fri, 31 Jan 2020 14:37:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="mxHONhCr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729019AbgAaOh4 (ORCPT ); Fri, 31 Jan 2020 09:37:56 -0500 Received: from ned.t-8ch.de ([212.47.237.191]:37354 "EHLO ned.t-8ch.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728825AbgAaOh4 (ORCPT ); Fri, 31 Jan 2020 09:37:56 -0500 From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1580481445; bh=4/3u1sKFM78XGpkDgV4KNfly5sI7hYOdhg5y4muK8Lk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mxHONhCrxhMsOg28VDzAHF05wc1X3+jUEzdu0NPeEGArBwZQnEcxtJFDlzabGQA6s Nij8iAYwj2XcBG3WH0tv/N6evPn/2Q676fBtWCQRfuFsbFuPor6DxPwF9T9jUpEUqK s45SV1Pbk8LWy6RNz9jFzWJmkBsmGSiahsBfFNj8= To: Henrique de Moraes Holschuh , Darren Hart , Andy Shevchenko Cc: ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Subject: [PATCH v2 1/3] platform/x86: thinkpad_acpi: remove unused defines Date: Fri, 31 Jan 2020 15:36:48 +0100 Message-Id: <20200131143650.4149-2-linux@weissschuh.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200131143650.4149-1-linux@weissschuh.net> References: <20200131143650.4149-1-linux@weissschuh.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 They were never used. Signed-off-by: Thomas Weißschuh --- drivers/platform/x86/thinkpad_acpi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index da794dcfdd92..2d3a99e3efb7 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -9323,9 +9323,6 @@ static struct ibm_struct mute_led_driver_data = { #define GET_STOP "BCSG" #define SET_STOP "BCSS" -#define START_ATTR "charge_start_threshold" -#define STOP_ATTR "charge_stop_threshold" - enum { BAT_ANY = 0, BAT_PRIMARY = 1, From patchwork Fri Jan 31 14:36:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 11360003 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6459213A4 for ; Fri, 31 Jan 2020 14:38:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42EC620705 for ; Fri, 31 Jan 2020 14:38:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="ZVQtTJaW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728972AbgAaOiL (ORCPT ); Fri, 31 Jan 2020 09:38:11 -0500 Received: from ned.t-8ch.de ([212.47.237.191]:37370 "EHLO ned.t-8ch.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728827AbgAaOiL (ORCPT ); Fri, 31 Jan 2020 09:38:11 -0500 From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1580481445; bh=d/HBCqKEtu13ihHegP4tYREK/3yRPONvTZnf4qI8ZCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZVQtTJaW72oLYszbZhRPQo4xGsWLMoyESnDL+o7J319cFH+B9GCpB2i1pYD30eRyp K8HQR2ycFZMprJJc9VGildCStKEd3GVi6ufrcnCW+YtMThGan2MCY4oV/uddjiBNoe FbwMa/wwxGUWrzjah06clsXgCfiDukyQ2j0vNUz8= To: Henrique de Moraes Holschuh , Darren Hart , Andy Shevchenko Cc: ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Subject: [PATCH v2 2/3] platform/x86: thinkpad_acpi: use standard charge control attribute names Date: Fri, 31 Jan 2020 15:36:49 +0100 Message-Id: <20200131143650.4149-3-linux@weissschuh.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200131143650.4149-2-linux@weissschuh.net> References: <20200131143650.4149-1-linux@weissschuh.net> <20200131143650.4149-2-linux@weissschuh.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 The standard attributes were only introduced after the ones from thinkpad_acpi in commit 813cab8f3994 ("power: supply: core: Add CHARGE_CONTROL_{START_THRESHOLD,END_THRESHOLD} properties"). Signed-off-by: Thomas Weißschuh --- drivers/platform/x86/thinkpad_acpi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 2d3a99e3efb7..5f0e3299778a 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -9608,40 +9608,40 @@ static ssize_t tpacpi_battery_show(int what, return sprintf(buf, "%d\n", ret); } -static ssize_t charge_start_threshold_show(struct device *device, +static ssize_t charge_control_start_threshold_show(struct device *device, struct device_attribute *attr, char *buf) { return tpacpi_battery_show(THRESHOLD_START, device, buf); } -static ssize_t charge_stop_threshold_show(struct device *device, +static ssize_t charge_control_end_threshold_show(struct device *device, struct device_attribute *attr, char *buf) { return tpacpi_battery_show(THRESHOLD_STOP, device, buf); } -static ssize_t charge_start_threshold_store(struct device *dev, +static ssize_t charge_control_start_threshold_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { return tpacpi_battery_store(THRESHOLD_START, dev, buf, count); } -static ssize_t charge_stop_threshold_store(struct device *dev, +static ssize_t charge_control_end_threshold_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { return tpacpi_battery_store(THRESHOLD_STOP, dev, buf, count); } -static DEVICE_ATTR_RW(charge_start_threshold); -static DEVICE_ATTR_RW(charge_stop_threshold); +static DEVICE_ATTR_RW(charge_control_start_threshold); +static DEVICE_ATTR_RW(charge_control_end_threshold); static struct attribute *tpacpi_battery_attrs[] = { - &dev_attr_charge_start_threshold.attr, - &dev_attr_charge_stop_threshold.attr, + &dev_attr_charge_control_start_threshold.attr, + &dev_attr_charge_control_end_threshold.attr, NULL, }; From patchwork Fri Jan 31 14:36:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 11360001 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC6891395 for ; Fri, 31 Jan 2020 14:38:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8363B20705 for ; Fri, 31 Jan 2020 14:38:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="Mo1hrMOy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728985AbgAaOiG (ORCPT ); Fri, 31 Jan 2020 09:38:06 -0500 Received: from ned.t-8ch.de ([212.47.237.191]:37364 "EHLO ned.t-8ch.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729060AbgAaOiF (ORCPT ); Fri, 31 Jan 2020 09:38:05 -0500 From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1580481445; bh=lQqAJct9Yuo28e2dXgyV7zV5l+ie2h3xCuN3ZDZgzwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mo1hrMOy2XUB0qm3UVpsPM6dGt9espikJCl1ifrhbiXLyphxJPouwAUYmvzto5AtI sjYqNhE04DJKJtg4C91uiQQFrgNQIEwTJ9LG2vWUvz/K0UWKnh0N01NmjSBMCnw1jC vKfaJNtCxJzOZdfWWJDOD8L76qh/mwXQR2ESg8ug= To: Henrique de Moraes Holschuh , Darren Hart , Andy Shevchenko Cc: ibm-acpi-devel@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Subject: [PATCH v2 3/3] platform/x86: thinkpad_acpi: restore old battery charge attributes Date: Fri, 31 Jan 2020 15:36:50 +0100 Message-Id: <20200131143650.4149-4-linux@weissschuh.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200131143650.4149-3-linux@weissschuh.net> References: <20200131143650.4149-1-linux@weissschuh.net> <20200131143650.4149-2-linux@weissschuh.net> <20200131143650.4149-3-linux@weissschuh.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 Alias the new standard attributes to their previous names, preserving backwards compatibility. Signed-off-by: Thomas Weißschuh --- drivers/platform/x86/thinkpad_acpi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 5f0e3299778a..2cbcd2e3092f 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -9638,10 +9638,24 @@ static ssize_t charge_control_end_threshold_store(struct device *dev, static DEVICE_ATTR_RW(charge_control_start_threshold); static DEVICE_ATTR_RW(charge_control_end_threshold); +struct device_attribute dev_attr_charge_start_threshold = __ATTR( + charge_start_threshold, + 0644, + charge_control_start_threshold_show, + charge_control_start_threshold_store +); +struct device_attribute dev_attr_charge_stop_threshold = __ATTR( + charge_stop_threshold, + 0644, + charge_control_end_threshold_show, + charge_control_end_threshold_store +); static struct attribute *tpacpi_battery_attrs[] = { &dev_attr_charge_control_start_threshold.attr, &dev_attr_charge_control_end_threshold.attr, + &dev_attr_charge_start_threshold.attr, + &dev_attr_charge_stop_threshold.attr, NULL, };