diff options
Diffstat (limited to 'drivers/acpi/ac.c')
-rw-r--r-- | drivers/acpi/ac.c | 256 |
1 files changed, 65 insertions, 191 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index f37beaa32750..b9f0d5f4bba5 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c | |||
@@ -30,10 +30,7 @@ | |||
30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
31 | #include <linux/dmi.h> | 31 | #include <linux/dmi.h> |
32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
33 | #ifdef CONFIG_ACPI_PROCFS_POWER | 33 | #include <linux/platform_device.h> |
34 | #include <linux/proc_fs.h> | ||
35 | #include <linux/seq_file.h> | ||
36 | #endif | ||
37 | #include <linux/power_supply.h> | 34 | #include <linux/power_supply.h> |
38 | #include <acpi/acpi_bus.h> | 35 | #include <acpi/acpi_bus.h> |
39 | #include <acpi/acpi_drivers.h> | 36 | #include <acpi/acpi_drivers.h> |
@@ -55,75 +52,30 @@ MODULE_AUTHOR("Paul Diefenbaugh"); | |||
55 | MODULE_DESCRIPTION("ACPI AC Adapter Driver"); | 52 | MODULE_DESCRIPTION("ACPI AC Adapter Driver"); |
56 | MODULE_LICENSE("GPL"); | 53 | MODULE_LICENSE("GPL"); |
57 | 54 | ||
58 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
59 | extern struct proc_dir_entry *acpi_lock_ac_dir(void); | ||
60 | extern void *acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir); | ||
61 | static int acpi_ac_open_fs(struct inode *inode, struct file *file); | ||
62 | #endif | ||
63 | |||
64 | static int acpi_ac_add(struct acpi_device *device); | ||
65 | static int acpi_ac_remove(struct acpi_device *device); | ||
66 | static void acpi_ac_notify(struct acpi_device *device, u32 event); | ||
67 | |||
68 | static const struct acpi_device_id ac_device_ids[] = { | ||
69 | {"ACPI0003", 0}, | ||
70 | {"", 0}, | ||
71 | }; | ||
72 | MODULE_DEVICE_TABLE(acpi, ac_device_ids); | ||
73 | |||
74 | #ifdef CONFIG_PM_SLEEP | ||
75 | static int acpi_ac_resume(struct device *dev); | ||
76 | #endif | ||
77 | static SIMPLE_DEV_PM_OPS(acpi_ac_pm, NULL, acpi_ac_resume); | ||
78 | |||
79 | static int ac_sleep_before_get_state_ms; | 55 | static int ac_sleep_before_get_state_ms; |
80 | 56 | ||
81 | static struct acpi_driver acpi_ac_driver = { | ||
82 | .name = "ac", | ||
83 | .class = ACPI_AC_CLASS, | ||
84 | .ids = ac_device_ids, | ||
85 | .flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS, | ||
86 | .ops = { | ||
87 | .add = acpi_ac_add, | ||
88 | .remove = acpi_ac_remove, | ||
89 | .notify = acpi_ac_notify, | ||
90 | }, | ||
91 | .drv.pm = &acpi_ac_pm, | ||
92 | }; | ||
93 | |||
94 | struct acpi_ac { | 57 | struct acpi_ac { |
95 | struct power_supply charger; | 58 | struct power_supply charger; |
96 | struct acpi_device * device; | 59 | struct acpi_device *adev; |
60 | struct platform_device *pdev; | ||
97 | unsigned long long state; | 61 | unsigned long long state; |
98 | }; | 62 | }; |
99 | 63 | ||
100 | #define to_acpi_ac(x) container_of(x, struct acpi_ac, charger) | 64 | #define to_acpi_ac(x) container_of(x, struct acpi_ac, charger) |
101 | 65 | ||
102 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
103 | static const struct file_operations acpi_ac_fops = { | ||
104 | .owner = THIS_MODULE, | ||
105 | .open = acpi_ac_open_fs, | ||
106 | .read = seq_read, | ||
107 | .llseek = seq_lseek, | ||
108 | .release = single_release, | ||
109 | }; | ||
110 | #endif | ||
111 | |||
112 | /* -------------------------------------------------------------------------- | 66 | /* -------------------------------------------------------------------------- |
113 | AC Adapter Management | 67 | AC Adapter Management |
114 | -------------------------------------------------------------------------- */ | 68 | -------------------------------------------------------------------------- */ |
115 | 69 | ||
116 | static int acpi_ac_get_state(struct acpi_ac *ac) | 70 | static int acpi_ac_get_state(struct acpi_ac *ac) |
117 | { | 71 | { |
118 | acpi_status status = AE_OK; | 72 | acpi_status status; |
119 | |||
120 | |||
121 | if (!ac) | ||
122 | return -EINVAL; | ||
123 | 73 | ||
124 | status = acpi_evaluate_integer(ac->device->handle, "_PSR", NULL, &ac->state); | 74 | status = acpi_evaluate_integer(ac->adev->handle, "_PSR", NULL, |
75 | &ac->state); | ||
125 | if (ACPI_FAILURE(status)) { | 76 | if (ACPI_FAILURE(status)) { |
126 | ACPI_EXCEPTION((AE_INFO, status, "Error reading AC Adapter state")); | 77 | ACPI_EXCEPTION((AE_INFO, status, |
78 | "Error reading AC Adapter state")); | ||
127 | ac->state = ACPI_AC_STATUS_UNKNOWN; | 79 | ac->state = ACPI_AC_STATUS_UNKNOWN; |
128 | return -ENODEV; | 80 | return -ENODEV; |
129 | } | 81 | } |
@@ -160,91 +112,13 @@ static enum power_supply_property ac_props[] = { | |||
160 | POWER_SUPPLY_PROP_ONLINE, | 112 | POWER_SUPPLY_PROP_ONLINE, |
161 | }; | 113 | }; |
162 | 114 | ||
163 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
164 | /* -------------------------------------------------------------------------- | ||
165 | FS Interface (/proc) | ||
166 | -------------------------------------------------------------------------- */ | ||
167 | |||
168 | static struct proc_dir_entry *acpi_ac_dir; | ||
169 | |||
170 | static int acpi_ac_seq_show(struct seq_file *seq, void *offset) | ||
171 | { | ||
172 | struct acpi_ac *ac = seq->private; | ||
173 | |||
174 | |||
175 | if (!ac) | ||
176 | return 0; | ||
177 | |||
178 | if (acpi_ac_get_state(ac)) { | ||
179 | seq_puts(seq, "ERROR: Unable to read AC Adapter state\n"); | ||
180 | return 0; | ||
181 | } | ||
182 | |||
183 | seq_puts(seq, "state: "); | ||
184 | switch (ac->state) { | ||
185 | case ACPI_AC_STATUS_OFFLINE: | ||
186 | seq_puts(seq, "off-line\n"); | ||
187 | break; | ||
188 | case ACPI_AC_STATUS_ONLINE: | ||
189 | seq_puts(seq, "on-line\n"); | ||
190 | break; | ||
191 | default: | ||
192 | seq_puts(seq, "unknown\n"); | ||
193 | break; | ||
194 | } | ||
195 | |||
196 | return 0; | ||
197 | } | ||
198 | |||
199 | static int acpi_ac_open_fs(struct inode *inode, struct file *file) | ||
200 | { | ||
201 | return single_open(file, acpi_ac_seq_show, PDE_DATA(inode)); | ||
202 | } | ||
203 | |||
204 | static int acpi_ac_add_fs(struct acpi_device *device) | ||
205 | { | ||
206 | struct proc_dir_entry *entry = NULL; | ||
207 | |||
208 | printk(KERN_WARNING PREFIX "Deprecated procfs I/F for AC is loaded," | ||
209 | " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n"); | ||
210 | if (!acpi_device_dir(device)) { | ||
211 | acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), | ||
212 | acpi_ac_dir); | ||
213 | if (!acpi_device_dir(device)) | ||
214 | return -ENODEV; | ||
215 | } | ||
216 | |||
217 | /* 'state' [R] */ | ||
218 | entry = proc_create_data(ACPI_AC_FILE_STATE, | ||
219 | S_IRUGO, acpi_device_dir(device), | ||
220 | &acpi_ac_fops, acpi_driver_data(device)); | ||
221 | if (!entry) | ||
222 | return -ENODEV; | ||
223 | return 0; | ||
224 | } | ||
225 | |||
226 | static int acpi_ac_remove_fs(struct acpi_device *device) | ||
227 | { | ||
228 | |||
229 | if (acpi_device_dir(device)) { | ||
230 | remove_proc_entry(ACPI_AC_FILE_STATE, acpi_device_dir(device)); | ||
231 | |||
232 | remove_proc_entry(acpi_device_bid(device), acpi_ac_dir); | ||
233 | acpi_device_dir(device) = NULL; | ||
234 | } | ||
235 | |||
236 | return 0; | ||
237 | } | ||
238 | #endif | ||
239 | |||
240 | /* -------------------------------------------------------------------------- | 115 | /* -------------------------------------------------------------------------- |
241 | Driver Model | 116 | Driver Model |
242 | -------------------------------------------------------------------------- */ | 117 | -------------------------------------------------------------------------- */ |
243 | 118 | ||
244 | static void acpi_ac_notify(struct acpi_device *device, u32 event) | 119 | static void acpi_ac_notify_handler(acpi_handle handle, u32 event, void *data) |
245 | { | 120 | { |
246 | struct acpi_ac *ac = acpi_driver_data(device); | 121 | struct acpi_ac *ac = data; |
247 | |||
248 | 122 | ||
249 | if (!ac) | 123 | if (!ac) |
250 | return; | 124 | return; |
@@ -267,10 +141,10 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event) | |||
267 | msleep(ac_sleep_before_get_state_ms); | 141 | msleep(ac_sleep_before_get_state_ms); |
268 | 142 | ||
269 | acpi_ac_get_state(ac); | 143 | acpi_ac_get_state(ac); |
270 | acpi_bus_generate_netlink_event(device->pnp.device_class, | 144 | acpi_bus_generate_netlink_event(ac->adev->pnp.device_class, |
271 | dev_name(&device->dev), event, | 145 | dev_name(&ac->pdev->dev), |
272 | (u32) ac->state); | 146 | event, (u32) ac->state); |
273 | acpi_notifier_call_chain(device, event, (u32) ac->state); | 147 | acpi_notifier_call_chain(ac->adev, event, (u32) ac->state); |
274 | kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE); | 148 | kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE); |
275 | } | 149 | } |
276 | 150 | ||
@@ -295,53 +169,55 @@ static struct dmi_system_id ac_dmi_table[] = { | |||
295 | {}, | 169 | {}, |
296 | }; | 170 | }; |
297 | 171 | ||
298 | static int acpi_ac_add(struct acpi_device *device) | 172 | static int acpi_ac_probe(struct platform_device *pdev) |
299 | { | 173 | { |
300 | int result = 0; | 174 | int result = 0; |
301 | struct acpi_ac *ac = NULL; | 175 | struct acpi_ac *ac = NULL; |
176 | struct acpi_device *adev; | ||
302 | 177 | ||
303 | 178 | if (!pdev) | |
304 | if (!device) | ||
305 | return -EINVAL; | 179 | return -EINVAL; |
306 | 180 | ||
181 | result = acpi_bus_get_device(ACPI_HANDLE(&pdev->dev), &adev); | ||
182 | if (result) | ||
183 | return -ENODEV; | ||
184 | |||
307 | ac = kzalloc(sizeof(struct acpi_ac), GFP_KERNEL); | 185 | ac = kzalloc(sizeof(struct acpi_ac), GFP_KERNEL); |
308 | if (!ac) | 186 | if (!ac) |
309 | return -ENOMEM; | 187 | return -ENOMEM; |
310 | 188 | ||
311 | ac->device = device; | 189 | strcpy(acpi_device_name(adev), ACPI_AC_DEVICE_NAME); |
312 | strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME); | 190 | strcpy(acpi_device_class(adev), ACPI_AC_CLASS); |
313 | strcpy(acpi_device_class(device), ACPI_AC_CLASS); | 191 | ac->adev = adev; |
314 | device->driver_data = ac; | 192 | ac->pdev = pdev; |
193 | platform_set_drvdata(pdev, ac); | ||
315 | 194 | ||
316 | result = acpi_ac_get_state(ac); | 195 | result = acpi_ac_get_state(ac); |
317 | if (result) | 196 | if (result) |
318 | goto end; | 197 | goto end; |
319 | 198 | ||
320 | #ifdef CONFIG_ACPI_PROCFS_POWER | 199 | ac->charger.name = acpi_device_bid(adev); |
321 | result = acpi_ac_add_fs(device); | ||
322 | #endif | ||
323 | if (result) | ||
324 | goto end; | ||
325 | ac->charger.name = acpi_device_bid(device); | ||
326 | ac->charger.type = POWER_SUPPLY_TYPE_MAINS; | 200 | ac->charger.type = POWER_SUPPLY_TYPE_MAINS; |
327 | ac->charger.properties = ac_props; | 201 | ac->charger.properties = ac_props; |
328 | ac->charger.num_properties = ARRAY_SIZE(ac_props); | 202 | ac->charger.num_properties = ARRAY_SIZE(ac_props); |
329 | ac->charger.get_property = get_ac_property; | 203 | ac->charger.get_property = get_ac_property; |
330 | result = power_supply_register(&ac->device->dev, &ac->charger); | 204 | result = power_supply_register(&pdev->dev, &ac->charger); |
331 | if (result) | 205 | if (result) |
332 | goto end; | 206 | goto end; |
333 | 207 | ||
208 | result = acpi_install_notify_handler(ACPI_HANDLE(&pdev->dev), | ||
209 | ACPI_DEVICE_NOTIFY, acpi_ac_notify_handler, ac); | ||
210 | if (result) { | ||
211 | power_supply_unregister(&ac->charger); | ||
212 | goto end; | ||
213 | } | ||
334 | printk(KERN_INFO PREFIX "%s [%s] (%s)\n", | 214 | printk(KERN_INFO PREFIX "%s [%s] (%s)\n", |
335 | acpi_device_name(device), acpi_device_bid(device), | 215 | acpi_device_name(adev), acpi_device_bid(adev), |
336 | ac->state ? "on-line" : "off-line"); | 216 | ac->state ? "on-line" : "off-line"); |
337 | 217 | ||
338 | end: | 218 | end: |
339 | if (result) { | 219 | if (result) |
340 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
341 | acpi_ac_remove_fs(device); | ||
342 | #endif | ||
343 | kfree(ac); | 220 | kfree(ac); |
344 | } | ||
345 | 221 | ||
346 | dmi_check_system(ac_dmi_table); | 222 | dmi_check_system(ac_dmi_table); |
347 | return result; | 223 | return result; |
@@ -356,7 +232,7 @@ static int acpi_ac_resume(struct device *dev) | |||
356 | if (!dev) | 232 | if (!dev) |
357 | return -EINVAL; | 233 | return -EINVAL; |
358 | 234 | ||
359 | ac = acpi_driver_data(to_acpi_device(dev)); | 235 | ac = platform_get_drvdata(to_platform_device(dev)); |
360 | if (!ac) | 236 | if (!ac) |
361 | return -EINVAL; | 237 | return -EINVAL; |
362 | 238 | ||
@@ -368,28 +244,44 @@ static int acpi_ac_resume(struct device *dev) | |||
368 | return 0; | 244 | return 0; |
369 | } | 245 | } |
370 | #endif | 246 | #endif |
247 | static SIMPLE_DEV_PM_OPS(acpi_ac_pm_ops, NULL, acpi_ac_resume); | ||
371 | 248 | ||
372 | static int acpi_ac_remove(struct acpi_device *device) | 249 | static int acpi_ac_remove(struct platform_device *pdev) |
373 | { | 250 | { |
374 | struct acpi_ac *ac = NULL; | 251 | struct acpi_ac *ac; |
375 | |||
376 | 252 | ||
377 | if (!device || !acpi_driver_data(device)) | 253 | if (!pdev) |
378 | return -EINVAL; | 254 | return -EINVAL; |
379 | 255 | ||
380 | ac = acpi_driver_data(device); | 256 | acpi_remove_notify_handler(ACPI_HANDLE(&pdev->dev), |
257 | ACPI_DEVICE_NOTIFY, acpi_ac_notify_handler); | ||
381 | 258 | ||
259 | ac = platform_get_drvdata(pdev); | ||
382 | if (ac->charger.dev) | 260 | if (ac->charger.dev) |
383 | power_supply_unregister(&ac->charger); | 261 | power_supply_unregister(&ac->charger); |
384 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
385 | acpi_ac_remove_fs(device); | ||
386 | #endif | ||
387 | 262 | ||
388 | kfree(ac); | 263 | kfree(ac); |
389 | 264 | ||
390 | return 0; | 265 | return 0; |
391 | } | 266 | } |
392 | 267 | ||
268 | static const struct acpi_device_id acpi_ac_match[] = { | ||
269 | { "ACPI0003", 0 }, | ||
270 | { } | ||
271 | }; | ||
272 | MODULE_DEVICE_TABLE(acpi, acpi_ac_match); | ||
273 | |||
274 | static struct platform_driver acpi_ac_driver = { | ||
275 | .probe = acpi_ac_probe, | ||
276 | .remove = acpi_ac_remove, | ||
277 | .driver = { | ||
278 | .name = "acpi-ac", | ||
279 | .owner = THIS_MODULE, | ||
280 | .pm = &acpi_ac_pm_ops, | ||
281 | .acpi_match_table = ACPI_PTR(acpi_ac_match), | ||
282 | }, | ||
283 | }; | ||
284 | |||
393 | static int __init acpi_ac_init(void) | 285 | static int __init acpi_ac_init(void) |
394 | { | 286 | { |
395 | int result; | 287 | int result; |
@@ -397,34 +289,16 @@ static int __init acpi_ac_init(void) | |||
397 | if (acpi_disabled) | 289 | if (acpi_disabled) |
398 | return -ENODEV; | 290 | return -ENODEV; |
399 | 291 | ||
400 | #ifdef CONFIG_ACPI_PROCFS_POWER | 292 | result = platform_driver_register(&acpi_ac_driver); |
401 | acpi_ac_dir = acpi_lock_ac_dir(); | 293 | if (result < 0) |
402 | if (!acpi_ac_dir) | ||
403 | return -ENODEV; | 294 | return -ENODEV; |
404 | #endif | ||
405 | |||
406 | result = acpi_bus_register_driver(&acpi_ac_driver); | ||
407 | if (result < 0) { | ||
408 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
409 | acpi_unlock_ac_dir(acpi_ac_dir); | ||
410 | #endif | ||
411 | return -ENODEV; | ||
412 | } | ||
413 | 295 | ||
414 | return 0; | 296 | return 0; |
415 | } | 297 | } |
416 | 298 | ||
417 | static void __exit acpi_ac_exit(void) | 299 | static void __exit acpi_ac_exit(void) |
418 | { | 300 | { |
419 | 301 | platform_driver_unregister(&acpi_ac_driver); | |
420 | acpi_bus_unregister_driver(&acpi_ac_driver); | ||
421 | |||
422 | #ifdef CONFIG_ACPI_PROCFS_POWER | ||
423 | acpi_unlock_ac_dir(acpi_ac_dir); | ||
424 | #endif | ||
425 | |||
426 | return; | ||
427 | } | 302 | } |
428 | |||
429 | module_init(acpi_ac_init); | 303 | module_init(acpi_ac_init); |
430 | module_exit(acpi_ac_exit); | 304 | module_exit(acpi_ac_exit); |