From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org
Cc: Alexey Starikovskiy <astarikivskiy@suse.de>,
Alexey Starikovskiy <astarikovskiy@suse.de>,
Len Brown <len.brown@intel.com>
Subject: [PATCH 04/32] ACPI: AC: Add sysfs interface
Date: Fri, 21 Sep 2007 23:46:10 -0400 [thread overview]
Message-ID: <11904328011699-git-send-email-lenb@kernel.org> (raw)
Message-ID: <481ad1a30bb2f3fba90f004055ad266f27e19199.1190432418.git.len.brown@intel.com> (raw)
In-Reply-To: <11904328012791-git-send-email-lenb@kernel.org>
In-Reply-To: <fd1caaed466de2ee100e250b6c755376eda7ba3b.1190432417.git.len.brown@intel.com>
From: Alexey Starikovskiy <astarikivskiy@suse.de>
Refer to Documentation/power_supply_class.txt for interface description.
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/ac.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 26d7070..a08ecbb 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -29,6 +29,12 @@
#include <linux/types.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
+
+#if defined(CONFIG_POWER_SUPPLY) || defined(CONFIG_POWER_SUPPLY_MODULE)
+#define ENABLE_POWER_SUPPLY
+#include <linux/power_supply.h>
+#endif
+
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
@@ -72,16 +78,42 @@ static struct acpi_driver acpi_ac_driver = {
};
struct acpi_ac {
+#ifdef ENABLE_POWER_SUPPLY
+ struct power_supply charger;
+#endif
struct acpi_device * device;
unsigned long state;
};
+#define to_acpi_ac(x) container_of(x, struct acpi_ac, charger);
+
static const struct file_operations acpi_ac_fops = {
.open = acpi_ac_open_fs,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
+#ifdef ENABLE_POWER_SUPPLY
+static int get_ac_property(struct power_supply *psy,
+ enum power_supply_property psp,
+ union power_supply_propval *val)
+{
+ struct acpi_ac *ac = to_acpi_ac(psy);
+ switch (psp) {
+ case POWER_SUPPLY_PROP_ONLINE:
+ val->intval = ac->state;
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static enum power_supply_property ac_props[] = {
+ POWER_SUPPLY_PROP_ONLINE,
+};
+
+#endif
/* --------------------------------------------------------------------------
AC Adapter Management
@@ -208,6 +240,9 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)
acpi_bus_generate_netlink_event(device->pnp.device_class,
device->dev.bus_id, event,
(u32) ac->state);
+#ifdef ENABLE_POWER_SUPPLY
+ kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);
+#endif
break;
default:
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -244,7 +279,14 @@ static int acpi_ac_add(struct acpi_device *device)
result = acpi_ac_add_fs(device);
if (result)
goto end;
-
+#ifdef ENABLE_POWER_SUPPLY
+ ac->charger.name = acpi_device_bid(device);
+ ac->charger.type = POWER_SUPPLY_TYPE_MAINS;
+ ac->charger.properties = ac_props;
+ ac->charger.num_properties = ARRAY_SIZE(ac_props);
+ ac->charger.get_property = get_ac_property;
+ power_supply_register(&ac->device->dev, &ac->charger);
+#endif
status = acpi_install_notify_handler(device->handle,
ACPI_ALL_NOTIFY, acpi_ac_notify,
ac);
@@ -279,7 +321,10 @@ static int acpi_ac_remove(struct acpi_device *device, int type)
status = acpi_remove_notify_handler(device->handle,
ACPI_ALL_NOTIFY, acpi_ac_notify);
-
+#ifdef ENABLE_POWER_SUPPLY
+ if (ac->charger.dev)
+ power_supply_unregister(&ac->charger);
+#endif
acpi_ac_remove_fs(device);
kfree(ac);
--
1.5.3.1.27.g57543
next prev parent reply other threads:[~2007-09-22 3:46 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-22 3:46 ACPI patches i test branch queued for 2.6.24 Len Brown
[not found] ` <fd1caaed466de2ee100e250b6c755376eda7ba3b.1190432417.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 01/32] sony-laptop: old Vaio models contain 2 IO port entries Len Brown
[not found] ` <d0482533c73a8685f7ce0951a10280cfd58b8825.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 02/32] fujitsu-laptop: create Fujitsu laptop platform specific driver Len Brown
[not found] ` <21bc42ab852549f4a547d18d77e0e4d1b24ffd96.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 03/32] ACPI: thermal: use round_jiffies when thermal zone polling is enabled Len Brown
[not found] ` <481ad1a30bb2f3fba90f004055ad266f27e19199.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` Len Brown [this message]
[not found] ` <0c1304d9e1295dd19568a937f106379f8e3d7629.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 05/32] ACPI: Battery: don't use acpi_extract_package() Len Brown
[not found] ` <f4e23e2f3ce393bf95038f7eb24352592ec9d91a.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 06/32] ACPI: Battery: simplify update scheme Len Brown
[not found] ` <89543b032d6a389f7d75e239b1d45b0ce3604a5f.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 07/32] ACPI: Battery: Misc clean-ups, no functional changes Len Brown
[not found] ` <cb7ce92d4707dcac07c934f794195e39bd08221f.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 08/32] ACPI: Add acpi_bus_generate_event4() function Len Brown
[not found] ` <e59812330152303aff434d2d3a8a2d9340fbb66e.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 09/32] ACPI: EC: Add new query handler to list head Len Brown
[not found] ` <f0ebb0c2228ebb95b1dc400bcc05d6fe873e2b3f.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 10/32] ACPI: SBS: Split host controller (ACPI0001) from SBS driver (ACPI0002) Len Brown
[not found] ` <86b80c709d723d55844097e589f2e58d39857d21.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 11/32] ACPI: SBS: Simplify data structures in SBS Len Brown
[not found] ` <011c6997c0b54067d89fde31b4cb5b01792afcd3.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 12/32] ACPI: SBS: Make SBS reads table-driven Len Brown
[not found] ` <fa5e2338bbbe17700781e6fdabf6cc158667c987.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 13/32] ACPI: SBS: Add support for power_supply class (and sysfs) Len Brown
[not found] ` <041a0232f1e89dfa7cffed74a6cbb121032c36f8.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 14/32] ACPI: SBS: Add ACPI_PROCFS around procfs handling code Len Brown
[not found] ` <f127e3766686c2d525d930fb2a707cc90df9e2f1.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 15/32] ACPI: SBS: Add sysfs alarm Len Brown
[not found] ` <6e2157858ac94530fddbf19dc59ab6b392baf1f3.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 16/32] ACPI: Thermal: Drop concurrent thermal checks Len Brown
[not found] ` <4500ca8e221e72cc38e7c239b9b1a041031ee450.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 17/32] ACPI: video: Don't call absent methods Len Brown
[not found] ` <63f0edfc0b7f8058f9d3f9b572615ec97ae011ba.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 18/32] ACPI: VIDEO: Adjust current level to closest available one Len Brown
[not found] ` <4c611060660f0de3e9b8f02df207312bc6f5c331.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 19/32] ACPI: EC: Drop ECDT-based boot_ec as soon as we find DSDT-based one Len Brown
[not found] ` <8a66074c379cacc79168681bf7dea37ad278f5d1.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 20/32] sony-laptop/thinkpad-acpi: fix INPUT=n build Len Brown
[not found] ` <03e2bf261e832abf48d40113ce08a70338dd18c9.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 21/32] acpi_video: kernel build error if !INPUT Len Brown
[not found] ` <063a87f8cab5e3fd3ddbd979da7a15746947add2.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 22/32] ACPI: Battery: Add sysfs support Len Brown
[not found] ` <0b5466f638ab34c816c862802833ea2e465ee58a.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 23/32] ACPI: Battery: add sysfs alarm Len Brown
[not found] ` <3c309933a8a7b80d83d0c5e1b1ea0ef1c18aa533.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 24/32] ACPI: thinkpad-acpi: make room for more features in tp_features bitfield Len Brown
[not found] ` <bb7babb9ad37bb7b915a9bbb0f46ebc4f8b7300f.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 25/32] ACPI: thinkpad-acpi: issue EV_SYNC after EV_SWITCH Len Brown
[not found] ` <92746a28e48c4a850f574f3dea1c073cada35a22.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 26/32] ACPI: thinkpad-acpi: add mutex-based locking to input device event send path Len Brown
[not found] ` <bb9267cf59a5419b512a9d100155050e17b037d7.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 27/32] ACPI: thinkpad-acpi: keep track of module state Len Brown
[not found] ` <5a45e2370d4cb99f8afc48274e4bba0978a089df.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 28/32] ACPI: thinkpad-acpi: check version of hot key firmware Len Brown
[not found] ` <245cd52bc6364cd274901cd1fee1ecb36cec8c4f.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 29/32] ACPI: thinkpad-acpi: dequeue all pending hot key events at once Len Brown
[not found] ` <f46d7bb7d0f22efe5de65cce4c5fbd6fe01239c2.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 30/32] ACPI: thinkpad-acpi: fix regression on HKEY LID event handling Len Brown
[not found] ` <8a4b57f787502d9fef5ac7e02f657f801ea15567.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 31/32] ACPI: hpet: ACPI Error (utglobal-0126): Unknown exception code: 0xFFFFFFF0 Len Brown
[not found] ` <be23f43fd65a639b190a2f5b2e4979d1268b0f52.1190432418.git.len.brown@intel.com>
2007-09-22 3:46 ` [PATCH 32/32] ACPI: Hibernate erroneously disabled Suspend wakeup devices Len Brown
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=11904328011699-git-send-email-lenb@kernel.org \
--to=lenb@kernel.org \
--cc=astarikivskiy@suse.de \
--cc=astarikovskiy@suse.de \
--cc=len.brown@intel.com \
--cc=linux-acpi@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).