| battery.c (f4b96f5e4ff8d86699c851c10245e102809b0331) | battery.c (952c63e9512b63220886105cfc791507046fa39a) |
|---|---|
| 1/* 2 * battery.c - ACPI Battery Driver (Revision: 2.0) 3 * 4 * Copyright (C) 2007 Alexey Starikovskiy <astarikovskiy@suse.de> 5 * Copyright (C) 2004-2007 Vladimir Lebedev <vladimir.p.lebedev@intel.com> 6 * Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com> 7 * Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> 8 * --- 534 unchanged lines hidden (view full) --- 543 return -ENODEV; 544 545 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Alarm set to %d\n", battery->alarm)); 546 return 0; 547} 548 549static int acpi_battery_init_alarm(struct acpi_battery *battery) 550{ | 1/* 2 * battery.c - ACPI Battery Driver (Revision: 2.0) 3 * 4 * Copyright (C) 2007 Alexey Starikovskiy <astarikovskiy@suse.de> 5 * Copyright (C) 2004-2007 Vladimir Lebedev <vladimir.p.lebedev@intel.com> 6 * Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com> 7 * Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> 8 * --- 534 unchanged lines hidden (view full) --- 543 return -ENODEV; 544 545 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Alarm set to %d\n", battery->alarm)); 546 return 0; 547} 548 549static int acpi_battery_init_alarm(struct acpi_battery *battery) 550{ |
| 551 acpi_status status = AE_OK; 552 acpi_handle handle = NULL; 553 | |
| 554 /* See if alarms are supported, and if so, set default */ | 551 /* See if alarms are supported, and if so, set default */ |
| 555 status = acpi_get_handle(battery->device->handle, "_BTP", &handle); 556 if (ACPI_FAILURE(status)) { | 552 if (!acpi_has_method(battery->device->handle, "_BTP")) { |
| 557 clear_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags); 558 return 0; 559 } 560 set_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags); 561 if (!battery->alarm) 562 battery->alarm = battery->design_capacity_warning; 563 return acpi_battery_set_alarm(battery); 564} --- 496 unchanged lines hidden (view full) --- 1061 1062 return 0; 1063} 1064 1065static int acpi_battery_add(struct acpi_device *device) 1066{ 1067 int result = 0; 1068 struct acpi_battery *battery = NULL; | 553 clear_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags); 554 return 0; 555 } 556 set_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags); 557 if (!battery->alarm) 558 battery->alarm = battery->design_capacity_warning; 559 return acpi_battery_set_alarm(battery); 560} --- 496 unchanged lines hidden (view full) --- 1057 1058 return 0; 1059} 1060 1061static int acpi_battery_add(struct acpi_device *device) 1062{ 1063 int result = 0; 1064 struct acpi_battery *battery = NULL; |
| 1069 acpi_handle handle; | 1065 |
| 1070 if (!device) 1071 return -EINVAL; 1072 battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL); 1073 if (!battery) 1074 return -ENOMEM; 1075 battery->device = device; 1076 strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME); 1077 strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS); 1078 device->driver_data = battery; 1079 mutex_init(&battery->lock); 1080 mutex_init(&battery->sysfs_lock); | 1066 if (!device) 1067 return -EINVAL; 1068 battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL); 1069 if (!battery) 1070 return -ENOMEM; 1071 battery->device = device; 1072 strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME); 1073 strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS); 1074 device->driver_data = battery; 1075 mutex_init(&battery->lock); 1076 mutex_init(&battery->sysfs_lock); |
| 1081 if (ACPI_SUCCESS(acpi_get_handle(battery->device->handle, 1082 "_BIX", &handle))) | 1077 if (acpi_has_method(battery->device->handle, "_BIX")) |
| 1083 set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags); 1084 result = acpi_battery_update(battery); 1085 if (result) 1086 goto fail; 1087#ifdef CONFIG_ACPI_PROCFS_POWER 1088 result = acpi_battery_add_fs(device); 1089#endif 1090 if (result) { --- 109 unchanged lines hidden --- | 1078 set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags); 1079 result = acpi_battery_update(battery); 1080 if (result) 1081 goto fail; 1082#ifdef CONFIG_ACPI_PROCFS_POWER 1083 result = acpi_battery_add_fs(device); 1084#endif 1085 if (result) { --- 109 unchanged lines hidden --- |