Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ACPI: battery: Lindent

Signed-off-by: Vladimir Lebedev <vladimir.p.lebedev@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

authored by

Vladimir Lebedev and committed by
Len Brown
9ea7d575 b6ce4083

+23 -13
+23 -13
drivers/acpi/battery.c
··· 123 123 124 124 struct acpi_battery { 125 125 struct mutex mutex; 126 - struct acpi_device * device; 126 + struct acpi_device *device; 127 127 struct acpi_battery_flags flags; 128 128 struct acpi_buffer bif_data; 129 129 struct acpi_buffer bst_data; ··· 241 241 242 242 /* Evalute _BIF */ 243 243 244 - status = acpi_evaluate_object(acpi_battery_handle(battery), "_BIF", NULL, &buffer); 244 + status = 245 + acpi_evaluate_object(acpi_battery_handle(battery), "_BIF", NULL, 246 + &buffer); 245 247 if (ACPI_FAILURE(status)) { 246 248 ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BIF")); 247 249 return -ENODEV; ··· 255 253 256 254 /* Extract Package Data */ 257 255 258 - result = acpi_battery_extract_package(battery, package, &format, data, "_BIF"); 256 + result = 257 + acpi_battery_extract_package(battery, package, &format, data, 258 + "_BIF"); 259 259 if (result) 260 260 goto end; 261 261 ··· 293 289 294 290 /* Evalute _BST */ 295 291 296 - status = acpi_evaluate_object(acpi_battery_handle(battery), "_BST", NULL, &buffer); 292 + status = 293 + acpi_evaluate_object(acpi_battery_handle(battery), "_BST", NULL, 294 + &buffer); 297 295 if (ACPI_FAILURE(status)) { 298 296 ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST")); 299 297 return -ENODEV; ··· 307 301 308 302 /* Extract Package Data */ 309 303 310 - result = acpi_battery_extract_package(battery, package, &format, data, "_BST"); 304 + result = 305 + acpi_battery_extract_package(battery, package, &format, data, 306 + "_BST"); 311 307 if (result) 312 308 goto end; 313 309 ··· 328 320 return 0; 329 321 } 330 322 331 - static int acpi_battery_set_alarm(struct acpi_battery *battery, unsigned long alarm) 323 + static int acpi_battery_set_alarm(struct acpi_battery *battery, 324 + unsigned long alarm) 332 325 { 333 326 acpi_status status = 0; 334 327 union acpi_object arg0 = { ACPI_TYPE_INTEGER }; ··· 345 336 346 337 arg0.integer.value = alarm; 347 338 348 - status = acpi_evaluate_object(acpi_battery_handle(battery), "_BTP", &arg_list, NULL); 339 + status = 340 + acpi_evaluate_object(acpi_battery_handle(battery), "_BTP", 341 + &arg_list, NULL); 349 342 if (ACPI_FAILURE(status)) 350 343 return -ENODEV; 351 344 ··· 411 400 } 412 401 413 402 static int acpi_battery_update(struct acpi_battery *battery, 414 - int update, int *update_result_ptr) 403 + int update, int *update_result_ptr) 415 404 { 416 405 int result = 0; 417 406 int update_result = ACPI_BATTERY_NONE_UPDATE; ··· 429 418 result = acpi_battery_get_status(battery); 430 419 if (result) 431 420 goto end;; 432 - if (acpi_battery_inserted(battery) || acpi_battery_removed(battery)) { 421 + if (acpi_battery_inserted(battery) 422 + || acpi_battery_removed(battery)) { 433 423 result = acpi_battery_init_update(battery); 434 424 if (result) 435 425 goto end;; ··· 782 770 struct acpi_battery *battery = m->private; 783 771 int update_result = ACPI_BATTERY_NONE_UPDATE; 784 772 785 - 786 773 if (!battery || (count > sizeof(alarm_string) - 1)) 787 774 return -EINVAL; 788 775 ··· 856 845 { 857 846 struct proc_dir_entry *entry = NULL; 858 847 859 - 860 848 if (!acpi_device_dir(device)) { 861 849 acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), 862 850 acpi_battery_dir); ··· 927 917 struct acpi_battery *battery = data; 928 918 struct acpi_device *device = NULL; 929 919 930 - 931 920 if (!battery) 932 921 return; 933 922 ··· 941 932 device = battery->device; 942 933 acpi_battery_notify_update(battery); 943 934 acpi_battery_mutex_unlock(battery); 944 - acpi_bus_generate_event(device, event, acpi_battery_present(battery)); 935 + acpi_bus_generate_event(device, event, 936 + acpi_battery_present(battery)); 945 937 break; 946 938 default: 947 939 ACPI_DEBUG_PRINT((ACPI_DB_INFO,