Commit b409214c683ed06c26e2cdad0be546ad11463354
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
b3e670443b
Exists in
master
and in
7 other branches
USB: remove fake "address-of" expressions
Fake "address-of" expressions that evaluate to NULL generally confuse readers and can provoke compiler warnings. This patch (as1412) removes three such fake expressions, using "#ifdef"s in their place. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 4 changed files with 15 additions and 23 deletions Side-by-side Diff
drivers/usb/core/driver.c
| ... | ... | @@ -1791,16 +1791,14 @@ |
| 1791 | 1791 | .runtime_idle = usb_runtime_idle, |
| 1792 | 1792 | }; |
| 1793 | 1793 | |
| 1794 | -#else | |
| 1795 | - | |
| 1796 | -#define usb_bus_pm_ops (*(const struct dev_pm_ops *) NULL) | |
| 1797 | - | |
| 1798 | 1794 | #endif /* CONFIG_USB_SUSPEND */ |
| 1799 | 1795 | |
| 1800 | 1796 | struct bus_type usb_bus_type = { |
| 1801 | 1797 | .name = "usb", |
| 1802 | 1798 | .match = usb_device_match, |
| 1803 | 1799 | .uevent = usb_uevent, |
| 1800 | +#ifdef CONFIG_USB_SUSPEND | |
| 1804 | 1801 | .pm = &usb_bus_pm_ops, |
| 1802 | +#endif | |
| 1805 | 1803 | }; |
drivers/usb/core/usb.c
| ... | ... | @@ -317,10 +317,6 @@ |
| 317 | 317 | .restore = usb_dev_restore, |
| 318 | 318 | }; |
| 319 | 319 | |
| 320 | -#else | |
| 321 | - | |
| 322 | -#define usb_device_pm_ops (*(struct dev_pm_ops *) NULL) | |
| 323 | - | |
| 324 | 320 | #endif /* CONFIG_PM */ |
| 325 | 321 | |
| 326 | 322 | |
| 327 | 323 | |
| ... | ... | @@ -338,7 +334,9 @@ |
| 338 | 334 | .release = usb_release_dev, |
| 339 | 335 | .uevent = usb_dev_uevent, |
| 340 | 336 | .devnode = usb_devnode, |
| 337 | +#ifdef CONFIG_PM | |
| 341 | 338 | .pm = &usb_device_pm_ops, |
| 339 | +#endif | |
| 342 | 340 | }; |
| 343 | 341 | |
| 344 | 342 |
drivers/usb/host/uhci-debug.c
| ... | ... | @@ -17,7 +17,6 @@ |
| 17 | 17 | |
| 18 | 18 | #include "uhci-hcd.h" |
| 19 | 19 | |
| 20 | -#define uhci_debug_operations (* (const struct file_operations *) NULL) | |
| 21 | 20 | static struct dentry *uhci_debugfs_root; |
| 22 | 21 | |
| 23 | 22 | #ifdef DEBUG |
| ... | ... | @@ -558,7 +557,6 @@ |
| 558 | 557 | return 0; |
| 559 | 558 | } |
| 560 | 559 | |
| 561 | -#undef uhci_debug_operations | |
| 562 | 560 | static const struct file_operations uhci_debug_operations = { |
| 563 | 561 | .owner = THIS_MODULE, |
| 564 | 562 | .open = uhci_debug_open, |
| ... | ... | @@ -566,6 +564,7 @@ |
| 566 | 564 | .read = uhci_debug_read, |
| 567 | 565 | .release = uhci_debug_release, |
| 568 | 566 | }; |
| 567 | +#define UHCI_DEBUG_OPS | |
| 569 | 568 | |
| 570 | 569 | #endif /* CONFIG_DEBUG_FS */ |
| 571 | 570 |
drivers/usb/host/uhci-hcd.c
| ... | ... | @@ -597,7 +597,7 @@ |
| 597 | 597 | struct uhci_hcd *uhci = hcd_to_uhci(hcd); |
| 598 | 598 | int retval = -EBUSY; |
| 599 | 599 | int i; |
| 600 | - struct dentry *dentry; | |
| 600 | + struct dentry __maybe_unused *dentry; | |
| 601 | 601 | |
| 602 | 602 | hcd->uses_new_polling = 1; |
| 603 | 603 | |
| 604 | 604 | |
| ... | ... | @@ -607,18 +607,16 @@ |
| 607 | 607 | INIT_LIST_HEAD(&uhci->idle_qh_list); |
| 608 | 608 | init_waitqueue_head(&uhci->waitqh); |
| 609 | 609 | |
| 610 | - if (DEBUG_CONFIGURED) { | |
| 611 | - dentry = debugfs_create_file(hcd->self.bus_name, | |
| 612 | - S_IFREG|S_IRUGO|S_IWUSR, uhci_debugfs_root, | |
| 613 | - uhci, &uhci_debug_operations); | |
| 614 | - if (!dentry) { | |
| 615 | - dev_err(uhci_dev(uhci), "couldn't create uhci " | |
| 616 | - "debugfs entry\n"); | |
| 617 | - retval = -ENOMEM; | |
| 618 | - goto err_create_debug_entry; | |
| 619 | - } | |
| 620 | - uhci->dentry = dentry; | |
| 610 | +#ifdef UHCI_DEBUG_OPS | |
| 611 | + dentry = debugfs_create_file(hcd->self.bus_name, | |
| 612 | + S_IFREG|S_IRUGO|S_IWUSR, uhci_debugfs_root, | |
| 613 | + uhci, &uhci_debug_operations); | |
| 614 | + if (!dentry) { | |
| 615 | + dev_err(uhci_dev(uhci), "couldn't create uhci debugfs entry\n"); | |
| 616 | + return -ENOMEM; | |
| 621 | 617 | } |
| 618 | + uhci->dentry = dentry; | |
| 619 | +#endif | |
| 622 | 620 | |
| 623 | 621 | uhci->frame = dma_alloc_coherent(uhci_dev(uhci), |
| 624 | 622 | UHCI_NUMFRAMES * sizeof(*uhci->frame), |
| ... | ... | @@ -732,7 +730,6 @@ |
| 732 | 730 | err_alloc_frame: |
| 733 | 731 | debugfs_remove(uhci->dentry); |
| 734 | 732 | |
| 735 | -err_create_debug_entry: | |
| 736 | 733 | return retval; |
| 737 | 734 | } |
| 738 | 735 |