linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Thomas Weißschuh" <linux@weissschuh.net>
To: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>,
	Darren Hart <dvhart@infradead.org>,
	Andy Shevchenko <andy@infradead.org>
Cc: ibm-acpi-devel@lists.sourceforge.net,
	platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	"Thomas Weißschuh" <linux@weissschuh.net>
Subject: [PATCH 2/3] platform/x86: thinkpad_acpi: use standard charge control attribute names
Date: Wed, 29 Jan 2020 21:43:37 +0100	[thread overview]
Message-ID: <20200129204338.4055-3-linux@weissschuh.net> (raw)
In-Reply-To: <20200129204338.4055-2-linux@weissschuh.net>

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 <linux@weissschuh.net>
---
 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..25e877789352 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_stop_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_stop_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_stop_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_stop_threshold.attr,
 	NULL,
 };
 
-- 
2.25.0


  reply	other threads:[~2020-01-29 20:51 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-29 20:43 [PATCH 0/3] platform/x86: thinkpad_acpi: use standard charge control attribute names Thomas Weißschuh
2020-01-29 20:43 ` [PATCH 1/3] platform/x86: thinkpad_acpi: remove unused defines Thomas Weißschuh
2020-01-29 20:43   ` Thomas Weißschuh [this message]
2020-01-29 20:43     ` [PATCH 3/3] platform/x86: thinkpad_acpi: restore old battery charge attributes Thomas Weißschuh
2020-01-31 14:36 ` [PATCH v2 0/3] platform/x86: thinkpad_acpi: use standard charge control attribute names Thomas Weißschuh
2020-01-31 14:36   ` [PATCH v2 1/3] platform/x86: thinkpad_acpi: remove unused defines Thomas Weißschuh
2020-01-31 14:36     ` [PATCH v2 2/3] platform/x86: thinkpad_acpi: use standard charge control attribute names Thomas Weißschuh
2020-01-31 14:36       ` [PATCH v2 3/3] platform/x86: thinkpad_acpi: restore old battery charge attributes Thomas Weißschuh
2020-02-03 10:00     ` [PATCH v2 1/3] platform/x86: thinkpad_acpi: remove unused defines Andy Shevchenko
2020-02-03 10:02       ` Andy Shevchenko
2020-02-03 10:04         ` Andy Shevchenko
2020-02-03 12:01   ` [PATCH v3 0/2] platform/x86: thinkpad_acpi: use standard charge control attribute names Thomas Weißschuh
2020-02-03 12:01     ` [PATCH v3 1/2] platform/x86: thinkpad_acpi: remove unused defines Thomas Weißschuh
2020-02-03 12:01       ` [PATCH v3 2/2] platform/x86: thinkpad_acpi: use standard charge control attribute names Thomas Weißschuh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200129204338.4055-3-linux@weissschuh.net \
    --to=linux@weissschuh.net \
    --cc=andy@infradead.org \
    --cc=dvhart@infradead.org \
    --cc=ibm-acpi-devel@lists.sourceforge.net \
    --cc=ibm-acpi@hmh.eng.br \
    --cc=linux-kernel@vger.kernel.org \
    --cc=platform-driver-x86@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).