Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 635227ee89929a6e2920fc8aa1cd48f7225d3d93

Authored by Len Brown
1 parent 3f86b83243
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ACPI: remove function tracing macros from drivers/acpi/*.c 

a few invocations appeared due to the SBS and other patches.

Signed-off-by: Len Brown <len.brown@intel.com>

Showing 4 changed files with 56 additions and 138 deletions Side-by-side Diff

drivers/acpi/cm_sbs.c
Diff comments   View file @ 635227e
... ... @@ -46,7 +46,6 @@
46 46  
47 47 struct proc_dir_entry *acpi_lock_ac_dir(void)
48 48 {
49   - ACPI_FUNCTION_TRACE("acpi_lock_ac_dir");
50 49  
51 50 down(&cm_sbs_sem);
52 51 if (!acpi_ac_dir) {
53 52  
... ... @@ -59,14 +58,13 @@
59 58 "Cannot create %s\n", ACPI_AC_CLASS));
60 59 }
61 60 up(&cm_sbs_sem);
62   - return (acpi_ac_dir);
  61 + return acpi_ac_dir;
63 62 }
64 63  
65 64 EXPORT_SYMBOL(acpi_lock_ac_dir);
66 65  
67 66 void acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir_param)
68 67 {
69   - ACPI_FUNCTION_TRACE("acpi_unlock_ac_dir");
70 68  
71 69 down(&cm_sbs_sem);
72 70 if (acpi_ac_dir_param) {
... ... @@ -83,7 +81,6 @@
83 81  
84 82 struct proc_dir_entry *acpi_lock_battery_dir(void)
85 83 {
86   - ACPI_FUNCTION_TRACE("acpi_lock_battery_dir");
87 84  
88 85 down(&cm_sbs_sem);
89 86 if (!acpi_battery_dir) {
90 87  
... ... @@ -97,14 +94,13 @@
97 94 "Cannot create %s\n", ACPI_BATTERY_CLASS));
98 95 }
99 96 up(&cm_sbs_sem);
100   - return (acpi_battery_dir);
  97 + return acpi_battery_dir;
101 98 }
102 99  
103 100 EXPORT_SYMBOL(acpi_lock_battery_dir);
104 101  
105 102 void acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir_param)
106 103 {
107   - ACPI_FUNCTION_TRACE("acpi_unlock_battery_dir");
108 104  
109 105 down(&cm_sbs_sem);
110 106 if (acpi_battery_dir_param) {
111 107  
112 108  
113 109  
... ... @@ -116,20 +112,20 @@
116 112 acpi_battery_dir = 0;
117 113 }
118 114 up(&cm_sbs_sem);
  115 + return;
119 116 }
120 117  
121 118 EXPORT_SYMBOL(acpi_unlock_battery_dir);
122 119  
123 120 static int __init acpi_cm_sbs_init(void)
124 121 {
125   - ACPI_FUNCTION_TRACE("acpi_cm_sbs_init");
126 122  
127 123 if (acpi_disabled)
128   - return_VALUE(0);
  124 + return 0;
129 125  
130 126 init_MUTEX(&cm_sbs_sem);
131 127  
132   - return_VALUE(0);
  128 + return 0;
133 129 }
134 130  
135 131 subsys_initcall(acpi_cm_sbs_init);
drivers/acpi/i2c_ec.c
Diff comments   View file @ 635227e
... ... @@ -115,8 +115,6 @@
115 115 u8 val;
116 116 int err;
117 117  
118   - ACPI_FUNCTION_TRACE("acpi_ec_smb_read");
119   -
120 118 err = ec_read(smbus->base + address, &val);
121 119 if (!err) {
122 120 *data = val;
... ... @@ -129,8 +127,6 @@
129 127 {
130 128 int err;
131 129  
132   - ACPI_FUNCTION_TRACE("acpi_ec_smb_write");
133   -
134 130 err = ec_write(smbus->base + address, data);
135 131 return (err);
136 132 }
... ... @@ -144,8 +140,6 @@
144 140 unsigned char protocol, len = 0, pec, temp[2] = { 0, 0 };
145 141 int i;
146 142  
147   - ACPI_FUNCTION_TRACE("acpi_ec_smb_access");
148   -
149 143 if (read_write == I2C_SMBUS_READ) {
150 144 protocol = ACPI_EC_SMB_PRTCL_READ;
151 145 } else {
... ... @@ -290,7 +284,6 @@
290 284  
291 285 static u32 acpi_ec_smb_func(struct i2c_adapter *adapter)
292 286 {
293   - ACPI_FUNCTION_TRACE("acpi_ec_smb_func");
294 287  
295 288 return (I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
296 289 I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
297 290  
298 291  
299 292  
... ... @@ -312,22 +305,20 @@
312 305 struct acpi_ec_hc *ec_hc;
313 306 struct acpi_ec_smbus *smbus;
314 307  
315   - ACPI_FUNCTION_TRACE("acpi_ec_hc_add");
316   -
317 308 if (!device) {
318   - return_VALUE(-EINVAL);
  309 + return -EINVAL;
319 310 }
320 311  
321 312 ec_hc = kmalloc(sizeof(struct acpi_ec_hc), GFP_KERNEL);
322 313 if (!ec_hc) {
323   - return_VALUE(-ENOMEM);
  314 + return -ENOMEM;
324 315 }
325 316 memset(ec_hc, 0, sizeof(struct acpi_ec_hc));
326 317  
327 318 smbus = kmalloc(sizeof(struct acpi_ec_smbus), GFP_KERNEL);
328 319 if (!smbus) {
329 320 kfree(ec_hc);
330   - return_VALUE(-ENOMEM);
  321 + return -ENOMEM;
331 322 }
332 323 memset(smbus, 0, sizeof(struct acpi_ec_smbus));
333 324  
... ... @@ -341,7 +332,7 @@
341 332 ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Error obtaining _EC\n"));
342 333 kfree(ec_hc->smbus);
343 334 kfree(smbus);
344   - return_VALUE(-EIO);
  335 + return -EIO;
345 336 }
346 337  
347 338 smbus->ec = acpi_driver_data(device->parent);
... ... @@ -357,7 +348,7 @@
357 348 "EC SMBus adapter: Failed to register adapter\n"));
358 349 kfree(smbus);
359 350 kfree(ec_hc);
360   - return_VALUE(-EIO);
  351 + return -EIO;
361 352 }
362 353  
363 354 ec_hc->smbus = smbus;
364 355  
365 356  
... ... @@ -365,17 +356,15 @@
365 356 printk(KERN_INFO PREFIX "%s [%s]\n",
366 357 acpi_device_name(device), acpi_device_bid(device));
367 358  
368   - return_VALUE(AE_OK);
  359 + return AE_OK;
369 360 }
370 361  
371 362 static int acpi_ec_hc_remove(struct acpi_device *device, int type)
372 363 {
373 364 struct acpi_ec_hc *ec_hc;
374 365  
375   - ACPI_FUNCTION_TRACE("acpi_ec_hc_remove");
376   -
377 366 if (!device) {
378   - return_VALUE(-EINVAL);
  367 + return -EINVAL;
379 368 }
380 369 ec_hc = acpi_driver_data(device);
381 370  
382 371  
383 372  
384 373  
385 374  
386 375  
... ... @@ -383,30 +372,27 @@
383 372 kfree(ec_hc->smbus);
384 373 kfree(ec_hc);
385 374  
386   - return_VALUE(AE_OK);
  375 + return AE_OK;
387 376 }
388 377  
389 378 static int __init acpi_ec_hc_init(void)
390 379 {
391 380 int result;
392 381  
393   - ACPI_FUNCTION_TRACE("acpi_ec_hc_init");
394 382 result = acpi_bus_register_driver(&acpi_ec_hc_driver);
395 383 if (result < 0) {
396   - return_VALUE(-ENODEV);
  384 + return -ENODEV;
397 385 }
398   - return_VALUE(0);
  386 + return 0;
399 387 }
400 388  
401 389 static void __exit acpi_ec_hc_exit(void)
402 390 {
403   - ACPI_FUNCTION_TRACE("acpi_ec_hc_exit");
404 391 acpi_bus_unregister_driver(&acpi_ec_hc_driver);
405 392 }
406 393  
407 394 struct acpi_ec_hc *acpi_get_ec_hc(struct acpi_device *device)
408 395 {
409   - ACPI_FUNCTION_TRACE("acpi_get_ec_hc");
410 396 return ((struct acpi_ec_hc *)acpi_driver_data(device->parent));
411 397 }
412 398  
... ... @@ -259,13 +259,11 @@
259 259 {
260 260 int pxm, node = -1;
261 261  
262   - ACPI_FUNCTION_TRACE("acpi_get_node");
263   -
264 262 pxm = acpi_get_pxm(handle);
265 263 if (pxm >= 0)
266 264 node = acpi_map_pxm_to_node(pxm);
267 265  
268   - return_VALUE(node);
  266 + return node;
269 267 }
270 268 EXPORT_SYMBOL(acpi_get_node);
... ... @@ -187,8 +187,6 @@
187 187 char *err_str;
188 188 int err_number;
189 189  
190   - ACPI_FUNCTION_TRACE("acpi_battery_smbus_err_handler");
191   -
192 190 data.word = 0;
193 191  
194 192 result = smbus->adapter.algo->
... ... @@ -239,8 +237,6 @@
239 237 int result = 0;
240 238 int i;
241 239  
242   - ACPI_FUNCTION_TRACE("acpi_sbs_smbus_read_word");
243   -
244 240 if (err_handler == NULL) {
245 241 err_handler = acpi_battery_smbus_err_handler;
246 242 }
... ... @@ -263,7 +259,7 @@
263 259 }
264 260 }
265 261  
266   - return_VALUE(result);
  262 + return result;
267 263 }
268 264  
269 265 static int
... ... @@ -275,8 +271,6 @@
275 271 int result = 0;
276 272 int i;
277 273  
278   - ACPI_FUNCTION_TRACE("acpi_sbs_smbus_read_str");
279   -
280 274 if (err_handler == NULL) {
281 275 err_handler = acpi_battery_smbus_err_handler;
282 276 }
... ... @@ -302,7 +296,7 @@
302 296 }
303 297 }
304 298  
305   - return_VALUE(result);
  299 + return result;
306 300 }
307 301  
308 302 static int
... ... @@ -314,8 +308,6 @@
314 308 int result = 0;
315 309 int i;
316 310  
317   - ACPI_FUNCTION_TRACE("acpi_sbs_smbus_write_word");
318   -
319 311 if (err_handler == NULL) {
320 312 err_handler = acpi_battery_smbus_err_handler;
321 313 }
... ... @@ -339,7 +331,7 @@
339 331 }
340 332 }
341 333  
342   - return_VALUE(result);
  334 + return result;
343 335 }
344 336  
345 337 /* --------------------------------------------------------------------------
... ... @@ -355,8 +347,6 @@
355 347 char class_saved[20];
356 348 int result = 0;
357 349  
358   - ACPI_FUNCTION_TRACE("acpi_sbs_generate_event");
359   -
360 350 strcpy(bid_saved, acpi_device_bid(device));
361 351 strcpy(class_saved, acpi_device_class(device));
362 352  
... ... @@ -368,7 +358,7 @@
368 358 strcpy(acpi_device_bid(device), bid_saved);
369 359 strcpy(acpi_device_class(device), class_saved);
370 360  
371   - return_VALUE(result);
  361 + return result;
372 362 }
373 363  
374 364 static int acpi_battery_get_present(struct acpi_battery *battery)
... ... @@ -377,8 +367,6 @@
377 367 int result = 0;
378 368 int is_present = 0;
379 369  
380   - ACPI_FUNCTION_TRACE("acpi_battery_get_present");
381   -
382 370 result = acpi_sbs_smbus_read_word(battery->sbs->smbus,
383 371 ACPI_SBSM_SMBUS_ADDR, 0x01,
384 372 &state, NULL);
... ... @@ -391,7 +379,7 @@
391 379 }
392 380 battery->battery_present = is_present;
393 381  
394   - return_VALUE(result);
  382 + return result;
395 383 }
396 384  
397 385 static int acpi_battery_is_present(struct acpi_battery *battery)
... ... @@ -411,8 +399,6 @@
411 399 s16 state;
412 400 int foo;
413 401  
414   - ACPI_FUNCTION_TRACE("acpi_battery_select");
415   -
416 402 if (battery->sbs->sbsm_present) {
417 403  
418 404 /* Take special care not to knobble other nibbles of
... ... @@ -440,7 +426,7 @@
440 426 }
441 427  
442 428 end:
443   - return_VALUE(result);
  429 + return result;
444 430 }
445 431  
446 432 static int acpi_sbsm_get_info(struct acpi_sbs *sbs)
... ... @@ -449,8 +435,6 @@
449 435 int result = 0;
450 436 s16 battery_system_info;
451 437  
452   - ACPI_FUNCTION_TRACE("acpi_sbsm_get_info");
453   -
454 438 result = acpi_sbs_smbus_read_word(smbus, ACPI_SBSM_SMBUS_ADDR, 0x04,
455 439 &battery_system_info, NULL);
456 440 if (result) {
... ... @@ -463,7 +447,7 @@
463 447  
464 448 end:
465 449  
466   - return_VALUE(result);
  450 + return result;
467 451 }
468 452  
469 453 static int acpi_battery_get_info(struct acpi_battery *battery)
... ... @@ -473,8 +457,6 @@
473 457 s16 battery_mode;
474 458 s16 specification_info;
475 459  
476   - ACPI_FUNCTION_TRACE("acpi_battery_get_info");
477   -
478 460 result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x03,
479 461 &battery_mode,
480 462 &acpi_battery_smbus_err_handler);
481 463  
... ... @@ -583,12 +565,11 @@
583 565 }
584 566  
585 567 end:
586   - return_VALUE(result);
  568 + return result;
587 569 }
588 570  
589 571 static void acpi_update_delay(struct acpi_sbs *sbs)
590 572 {
591   - ACPI_FUNCTION_TRACE("acpi_update_delay");
592 573 if (sbs->zombie) {
593 574 return;
594 575 }
... ... @@ -602,8 +583,6 @@
602 583 struct acpi_ec_smbus *smbus = battery->sbs->smbus;
603 584 int result = 0;
604 585  
605   - ACPI_FUNCTION_TRACE("acpi_battery_get_state");
606   -
607 586 acpi_update_delay(battery->sbs);
608 587 result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x09,
609 588 &battery->state.voltage,
... ... @@ -667,7 +646,7 @@
667 646 acpi_update_delay(battery->sbs);
668 647  
669 648 end:
670   - return_VALUE(result);
  649 + return result;
671 650 }
672 651  
673 652 static int acpi_battery_get_alarm(struct acpi_battery *battery)
... ... @@ -675,8 +654,6 @@
675 654 struct acpi_ec_smbus *smbus = battery->sbs->smbus;
676 655 int result = 0;
677 656  
678   - ACPI_FUNCTION_TRACE("acpi_battery_get_alarm");
679   -
680 657 result = acpi_sbs_smbus_read_word(smbus, ACPI_SB_SMBUS_ADDR, 0x01,
681 658 &battery->alarm.remaining_capacity,
682 659 &acpi_battery_smbus_err_handler);
... ... @@ -690,7 +667,7 @@
690 667  
691 668 end:
692 669  
693   - return_VALUE(result);
  670 + return result;
694 671 }
695 672  
696 673 static int acpi_battery_set_alarm(struct acpi_battery *battery,
... ... @@ -701,8 +678,6 @@
701 678 s16 battery_mode;
702 679 int foo;
703 680  
704   - ACPI_FUNCTION_TRACE("acpi_battery_set_alarm");
705   -
706 681 result = acpi_battery_select(battery);
707 682 if (result) {
708 683 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
... ... @@ -746,7 +721,7 @@
746 721  
747 722 end:
748 723  
749   - return_VALUE(result);
  724 + return result;
750 725 }
751 726  
752 727 static int acpi_battery_set_mode(struct acpi_battery *battery)
... ... @@ -754,8 +729,6 @@
754 729 int result = 0;
755 730 s16 battery_mode;
756 731  
757   - ACPI_FUNCTION_TRACE("acpi_battery_set_mode");
758   -
759 732 if (capacity_mode == DEF_CAPACITY_UNIT) {
760 733 goto end;
761 734 }
762 735  
... ... @@ -793,15 +766,13 @@
793 766 }
794 767  
795 768 end:
796   - return_VALUE(result);
  769 + return result;
797 770 }
798 771  
799 772 static int acpi_battery_init(struct acpi_battery *battery)
800 773 {
801 774 int result = 0;
802 775  
803   - ACPI_FUNCTION_TRACE("acpi_battery_init");
804   -
805 776 result = acpi_battery_select(battery);
806 777 if (result) {
807 778 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
... ... @@ -838,7 +809,7 @@
838 809 }
839 810  
840 811 end:
841   - return_VALUE(result);
  812 + return result;
842 813 }
843 814  
844 815 static int acpi_ac_get_present(struct acpi_sbs *sbs)
... ... @@ -847,8 +818,6 @@
847 818 int result = 0;
848 819 s16 charger_status;
849 820  
850   - ACPI_FUNCTION_TRACE("acpi_ac_get_present");
851   -
852 821 result = acpi_sbs_smbus_read_word(smbus, ACPI_SBC_SMBUS_ADDR, 0x13,
853 822 &charger_status, NULL);
854 823  
... ... @@ -862,7 +831,7 @@
862 831  
863 832 end:
864 833  
865   - return_VALUE(result);
  834 + return result;
866 835 }
867 836  
868 837 /* --------------------------------------------------------------------------
869 838  
... ... @@ -881,14 +850,12 @@
881 850 {
882 851 struct proc_dir_entry *entry = NULL;
883 852  
884   - ACPI_FUNCTION_TRACE("acpi_sbs_generic_add_fs");
885   -
886 853 if (!*dir) {
887 854 *dir = proc_mkdir(dir_name, parent_dir);
888 855 if (!*dir) {
889 856 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
890 857 "proc_mkdir() failed\n"));
891   - return_VALUE(-ENODEV);
  858 + return -ENODEV;
892 859 }
893 860 (*dir)->owner = THIS_MODULE;
894 861 }
895 862  
... ... @@ -932,14 +899,13 @@
932 899 }
933 900 }
934 901  
935   - return_VALUE(0);
  902 + return 0;
936 903 }
937 904  
938 905 static void
939 906 acpi_sbs_generic_remove_fs(struct proc_dir_entry **dir,
940 907 struct proc_dir_entry *parent_dir)
941 908 {
942   - ACPI_FUNCTION_TRACE("acpi_sbs_generic_remove_fs");
943 909  
944 910 if (*dir) {
945 911 remove_proc_entry(ACPI_SBS_FILE_INFO, *dir);
946 912  
... ... @@ -961,10 +927,8 @@
961 927 int cscale;
962 928 int result = 0;
963 929  
964   - ACPI_FUNCTION_TRACE("acpi_battery_read_info");
965   -
966 930 if (battery->sbs->zombie) {
967   - return_VALUE(-ENODEV);
  931 + return -ENODEV;
968 932 }
969 933  
970 934 down(&sbs_sem);
... ... @@ -1023,7 +987,7 @@
1023 987  
1024 988 up(&sbs_sem);
1025 989  
1026   - return_VALUE(result);
  990 + return result;
1027 991 }
1028 992  
1029 993 static int acpi_battery_info_open_fs(struct inode *inode, struct file *file)
1030 994  
... ... @@ -1038,10 +1002,8 @@
1038 1002 int cscale;
1039 1003 int foo;
1040 1004  
1041   - ACPI_FUNCTION_TRACE("acpi_battery_read_state");
1042   -
1043 1005 if (battery->sbs->zombie) {
1044   - return_VALUE(-ENODEV);
  1006 + return -ENODEV;
1045 1007 }
1046 1008  
1047 1009 down(&sbs_sem);
... ... @@ -1104,7 +1066,7 @@
1104 1066  
1105 1067 up(&sbs_sem);
1106 1068  
1107   - return_VALUE(result);
  1069 + return result;
1108 1070 }
1109 1071  
1110 1072 static int acpi_battery_state_open_fs(struct inode *inode, struct file *file)
1111 1073  
... ... @@ -1118,10 +1080,8 @@
1118 1080 int result = 0;
1119 1081 int cscale;
1120 1082  
1121   - ACPI_FUNCTION_TRACE("acpi_battery_read_alarm");
1122   -
1123 1083 if (battery->sbs->zombie) {
1124   - return_VALUE(-ENODEV);
  1084 + return -ENODEV;
1125 1085 }
1126 1086  
1127 1087 down(&sbs_sem);
... ... @@ -1158,7 +1118,7 @@
1158 1118  
1159 1119 up(&sbs_sem);
1160 1120  
1161   - return_VALUE(result);
  1121 + return result;
1162 1122 }
1163 1123  
1164 1124 static ssize_t
1165 1125  
... ... @@ -1170,10 +1130,8 @@
1170 1130 char alarm_string[12] = { '\0' };
1171 1131 int result, old_alarm, new_alarm;
1172 1132  
1173   - ACPI_FUNCTION_TRACE("acpi_battery_write_alarm");
1174   -
1175 1133 if (battery->sbs->zombie) {
1176   - return_VALUE(-ENODEV);
  1134 + return -ENODEV;
1177 1135 }
1178 1136  
1179 1137 down(&sbs_sem);
1180 1138  
... ... @@ -1217,9 +1175,9 @@
1217 1175 up(&sbs_sem);
1218 1176  
1219 1177 if (result) {
1220   - return_VALUE(result);
  1178 + return result;
1221 1179 } else {
1222   - return_VALUE(count);
  1180 + return count;
1223 1181 }
1224 1182 }
1225 1183  
1226 1184  
... ... @@ -1262,10 +1220,8 @@
1262 1220 struct acpi_sbs *sbs = (struct acpi_sbs *)seq->private;
1263 1221 int result;
1264 1222  
1265   - ACPI_FUNCTION_TRACE("acpi_ac_read_state");
1266   -
1267 1223 if (sbs->zombie) {
1268   - return_VALUE(-ENODEV);
  1224 + return -ENODEV;
1269 1225 }
1270 1226  
1271 1227 down(&sbs_sem);
... ... @@ -1283,7 +1239,7 @@
1283 1239  
1284 1240 up(&sbs_sem);
1285 1241  
1286   - return_VALUE(0);
  1242 + return 0;
1287 1243 }
1288 1244  
1289 1245 static int acpi_ac_state_open_fs(struct inode *inode, struct file *file)
... ... @@ -1312,8 +1268,6 @@
1312 1268 char dir_name[32];
1313 1269 struct acpi_battery *battery;
1314 1270  
1315   - ACPI_FUNCTION_TRACE("acpi_battery_add");
1316   -
1317 1271 battery = &sbs->battery[id];
1318 1272  
1319 1273 battery->alive = 0;
1320 1274  
... ... @@ -1364,12 +1318,11 @@
1364 1318 battery->alive = 1;
1365 1319  
1366 1320 end:
1367   - return_VALUE(result);
  1321 + return result;
1368 1322 }
1369 1323  
1370 1324 static void acpi_battery_remove(struct acpi_sbs *sbs, int id)
1371 1325 {
1372   - ACPI_FUNCTION_TRACE("acpi_battery_remove");
1373 1326  
1374 1327 if (sbs->battery[id].battery_entry) {
1375 1328 acpi_sbs_generic_remove_fs(&(sbs->battery[id].battery_entry),
... ... @@ -1381,8 +1334,6 @@
1381 1334 {
1382 1335 int result;
1383 1336  
1384   - ACPI_FUNCTION_TRACE("acpi_ac_add");
1385   -
1386 1337 result = acpi_ac_get_present(sbs);
1387 1338 if (result) {
1388 1339 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
1389 1340  
... ... @@ -1402,12 +1353,11 @@
1402 1353  
1403 1354 end:
1404 1355  
1405   - return_VALUE(result);
  1356 + return result;
1406 1357 }
1407 1358  
1408 1359 static void acpi_ac_remove(struct acpi_sbs *sbs)
1409 1360 {
1410   - ACPI_FUNCTION_TRACE("acpi_ac_remove");
1411 1361  
1412 1362 if (sbs->ac_entry) {
1413 1363 acpi_sbs_generic_remove_fs(&sbs->ac_entry, acpi_ac_dir);
... ... @@ -1416,7 +1366,6 @@
1416 1366  
1417 1367 static void acpi_sbs_update_queue_run(unsigned long data)
1418 1368 {
1419   - ACPI_FUNCTION_TRACE("acpi_sbs_update_queue_run");
1420 1369 acpi_os_execute(OSL_GPE_HANDLER, acpi_sbs_update_queue, (void *)data);
1421 1370 }
1422 1371  
... ... @@ -1433,8 +1382,6 @@
1433 1382 int do_battery_init, do_ac_init;
1434 1383 s16 old_remaining_capacity;
1435 1384  
1436   - ACPI_FUNCTION_TRACE("acpi_sbs_update_run");
1437   -
1438 1385 if (sbs->zombie) {
1439 1386 goto end;
1440 1387 }
... ... @@ -1584,7 +1531,7 @@
1584 1531 }
1585 1532  
1586 1533 end:
1587   - return_VALUE(result);
  1534 + return result;
1588 1535 }
1589 1536  
1590 1537 static void acpi_sbs_update_queue(void *data)
... ... @@ -1593,8 +1540,6 @@
1593 1540 unsigned long delay = -1;
1594 1541 int result;
1595 1542  
1596   - ACPI_FUNCTION_TRACE("acpi_sbs_update_queue");
1597   -
1598 1543 if (sbs->zombie) {
1599 1544 goto end;
1600 1545 }
1601 1546  
... ... @@ -1631,12 +1576,10 @@
1631 1576 int id, cnt;
1632 1577 acpi_status status = AE_OK;
1633 1578  
1634   - ACPI_FUNCTION_TRACE("acpi_sbs_add");
1635   -
1636 1579 sbs = kmalloc(sizeof(struct acpi_sbs), GFP_KERNEL);
1637 1580 if (!sbs) {
1638 1581 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "kmalloc() failed\n"));
1639   - return_VALUE(-ENOMEM);
  1582 + return -ENOMEM;
1640 1583 }
1641 1584 memset(sbs, 0, sizeof(struct acpi_sbs));
1642 1585  
... ... @@ -1737,7 +1680,7 @@
1737 1680 }
1738 1681 }
1739 1682  
1740   - return_VALUE(result);
  1683 + return result;
1741 1684 }
1742 1685  
1743 1686 int acpi_sbs_remove(struct acpi_device *device, int type)
1744 1687  
... ... @@ -1745,10 +1688,8 @@
1745 1688 struct acpi_sbs *sbs = (struct acpi_sbs *)acpi_driver_data(device);
1746 1689 int id;
1747 1690  
1748   - ACPI_FUNCTION_TRACE("acpi_sbs_remove");
1749   -
1750 1691 if (!device || !sbs) {
1751   - return_VALUE(-EINVAL);
  1692 + return -EINVAL;
1752 1693 }
1753 1694  
1754 1695 sbs->zombie = 1;
1755 1696  
... ... @@ -1766,15 +1707,13 @@
1766 1707  
1767 1708 kfree(sbs);
1768 1709  
1769   - return_VALUE(0);
  1710 + return 0;
1770 1711 }
1771 1712  
1772 1713 static int __init acpi_sbs_init(void)
1773 1714 {
1774 1715 int result = 0;
1775 1716  
1776   - ACPI_FUNCTION_TRACE("acpi_sbs_init");
1777   -
1778 1717 init_MUTEX(&sbs_sem);
1779 1718  
1780 1719 if (capacity_mode != DEF_CAPACITY_UNIT
1781 1720  
1782 1721  
1783 1722  
1784 1723  
1785 1724  
... ... @@ -1783,36 +1722,35 @@
1783 1722 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "acpi_sbs_init: "
1784 1723 "invalid capacity_mode = %d\n",
1785 1724 capacity_mode));
1786   - return_VALUE(-EINVAL);
  1725 + return -EINVAL;
1787 1726 }
1788 1727  
1789 1728 acpi_ac_dir = acpi_lock_ac_dir();
1790 1729 if (!acpi_ac_dir) {
1791 1730 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
1792 1731 "acpi_lock_ac_dir() failed\n"));
1793   - return_VALUE(-ENODEV);
  1732 + return -ENODEV;
1794 1733 }
1795 1734  
1796 1735 acpi_battery_dir = acpi_lock_battery_dir();
1797 1736 if (!acpi_battery_dir) {
1798 1737 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
1799 1738 "acpi_lock_battery_dir() failed\n"));
1800   - return_VALUE(-ENODEV);
  1739 + return -ENODEV;
1801 1740 }
1802 1741  
1803 1742 result = acpi_bus_register_driver(&acpi_sbs_driver);
1804 1743 if (result < 0) {
1805 1744 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
1806 1745 "acpi_bus_register_driver() failed\n"));
1807   - return_VALUE(-ENODEV);
  1746 + return -ENODEV;
1808 1747 }
1809 1748  
1810   - return_VALUE(0);
  1749 + return 0;
1811 1750 }
1812 1751  
1813 1752 static void __exit acpi_sbs_exit(void)
1814 1753 {
1815   - ACPI_FUNCTION_TRACE("acpi_sbs_exit");
1816 1754  
1817 1755 acpi_bus_unregister_driver(&acpi_sbs_driver);
1818 1756  
... ... @@ -1821,7 +1759,7 @@
1821 1759 acpi_unlock_battery_dir(acpi_battery_dir);
1822 1760 acpi_battery_dir = NULL;
1823 1761  
1824   - return_VOID;
  1762 + return;
1825 1763 }
1826 1764  
1827 1765 module_init(acpi_sbs_init);