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

USB: rework C++-style comments

This patch (as911) replaces some C++-style commented-out debugging
lines in driver.c with a new "verbose debugging" macro. It makes the
code look cleaner, and it's easier to turn the debugging on or off.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Alan Stern and committed by
Greg Kroah-Hartman
20dfdad7 d4ead16f

+29 -21
+29 -21
drivers/usb/core/driver.c
··· 29 29 #include "hcd.h" 30 30 #include "usb.h" 31 31 32 + #define VERBOSE_DEBUG 0 33 + 34 + #if VERBOSE_DEBUG 35 + #define dev_vdbg dev_dbg 36 + #else 37 + #define dev_vdbg(dev, fmt, args...) do { } while (0) 38 + #endif 39 + 32 40 #ifdef CONFIG_HOTPLUG 33 41 34 42 /* ··· 820 812 } 821 813 status = udriver->suspend(udev, msg); 822 814 823 - done: 824 - // dev_dbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); 815 + done: 816 + dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); 825 817 if (status == 0) 826 818 udev->dev.power.power_state.event = msg.event; 827 819 return status; ··· 850 842 udriver = to_usb_device_driver(udev->dev.driver); 851 843 status = udriver->resume(udev); 852 844 853 - done: 854 - // dev_dbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); 845 + done: 846 + dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); 855 847 if (status == 0) { 856 848 udev->autoresume_disabled = 0; 857 849 udev->dev.power.power_state.event = PM_EVENT_ON; ··· 889 881 mark_quiesced(intf); 890 882 } 891 883 892 - done: 893 - // dev_dbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status); 884 + done: 885 + dev_vdbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status); 894 886 return status; 895 887 } 896 888 ··· 927 919 driver->name); 928 920 929 921 done: 930 - // dev_dbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status); 922 + dev_vdbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status); 931 923 if (status == 0) 932 924 mark_active(intf); 933 925 return status; ··· 1091 1083 } 1092 1084 1093 1085 done: 1094 - // dev_dbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); 1086 + dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); 1095 1087 return status; 1096 1088 } 1097 1089 ··· 1188 1180 } 1189 1181 1190 1182 done: 1191 - // dev_dbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); 1183 + dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status); 1192 1184 udev->reset_resume = 0; 1193 1185 return status; 1194 1186 } ··· 1256 1248 int status; 1257 1249 1258 1250 status = usb_autopm_do_device(udev, -1); 1259 - // dev_dbg(&udev->dev, "%s: cnt %d\n", 1260 - // __FUNCTION__, udev->pm_usage_cnt); 1251 + dev_vdbg(&udev->dev, "%s: cnt %d\n", 1252 + __FUNCTION__, udev->pm_usage_cnt); 1261 1253 } 1262 1254 1263 1255 /** ··· 1276 1268 void usb_try_autosuspend_device(struct usb_device *udev) 1277 1269 { 1278 1270 usb_autopm_do_device(udev, 0); 1279 - // dev_dbg(&udev->dev, "%s: cnt %d\n", 1280 - // __FUNCTION__, udev->pm_usage_cnt); 1271 + dev_vdbg(&udev->dev, "%s: cnt %d\n", 1272 + __FUNCTION__, udev->pm_usage_cnt); 1281 1273 } 1282 1274 1283 1275 /** ··· 1304 1296 int status; 1305 1297 1306 1298 status = usb_autopm_do_device(udev, 1); 1307 - // dev_dbg(&udev->dev, "%s: status %d cnt %d\n", 1308 - // __FUNCTION__, status, udev->pm_usage_cnt); 1299 + dev_vdbg(&udev->dev, "%s: status %d cnt %d\n", 1300 + __FUNCTION__, status, udev->pm_usage_cnt); 1309 1301 return status; 1310 1302 } 1311 1303 ··· 1377 1369 int status; 1378 1370 1379 1371 status = usb_autopm_do_interface(intf, -1); 1380 - // dev_dbg(&intf->dev, "%s: status %d cnt %d\n", 1381 - // __FUNCTION__, status, intf->pm_usage_cnt); 1372 + dev_vdbg(&intf->dev, "%s: status %d cnt %d\n", 1373 + __FUNCTION__, status, intf->pm_usage_cnt); 1382 1374 } 1383 1375 EXPORT_SYMBOL_GPL(usb_autopm_put_interface); 1384 1376 ··· 1421 1413 int status; 1422 1414 1423 1415 status = usb_autopm_do_interface(intf, 1); 1424 - // dev_dbg(&intf->dev, "%s: status %d cnt %d\n", 1425 - // __FUNCTION__, status, intf->pm_usage_cnt); 1416 + dev_vdbg(&intf->dev, "%s: status %d cnt %d\n", 1417 + __FUNCTION__, status, intf->pm_usage_cnt); 1426 1418 return status; 1427 1419 } 1428 1420 EXPORT_SYMBOL_GPL(usb_autopm_get_interface); ··· 1443 1435 int status; 1444 1436 1445 1437 status = usb_autopm_do_interface(intf, 0); 1446 - // dev_dbg(&intf->dev, "%s: status %d cnt %d\n", 1447 - // __FUNCTION__, status, intf->pm_usage_cnt); 1438 + dev_vdbg(&intf->dev, "%s: status %d cnt %d\n", 1439 + __FUNCTION__, status, intf->pm_usage_cnt); 1448 1440 return status; 1449 1441 } 1450 1442 EXPORT_SYMBOL_GPL(usb_autopm_set_interface);