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

dynamic_debug: change __dynamic_<foo>_dbg return types to void

The return value is not used by callers of these functions
so change the functions to return void.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jason Baron <jbaron@akamai.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Joe Perches and committed by
Greg Kroah-Hartman
906d2015 33ead538

+26 -36
+6 -6
include/linux/dynamic_debug.h
··· 42 42 #if defined(CONFIG_DYNAMIC_DEBUG) 43 43 extern int ddebug_remove_module(const char *mod_name); 44 44 extern __printf(2, 3) 45 - int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...); 45 + void __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...); 46 46 47 47 extern int ddebug_dyndbg_module_param_cb(char *param, char *val, 48 48 const char *modname); ··· 50 50 struct device; 51 51 52 52 extern __printf(3, 4) 53 - int __dynamic_dev_dbg(struct _ddebug *descriptor, const struct device *dev, 54 - const char *fmt, ...); 53 + void __dynamic_dev_dbg(struct _ddebug *descriptor, const struct device *dev, 54 + const char *fmt, ...); 55 55 56 56 struct net_device; 57 57 58 58 extern __printf(3, 4) 59 - int __dynamic_netdev_dbg(struct _ddebug *descriptor, 60 - const struct net_device *dev, 61 - const char *fmt, ...); 59 + void __dynamic_netdev_dbg(struct _ddebug *descriptor, 60 + const struct net_device *dev, 61 + const char *fmt, ...); 62 62 63 63 #define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) \ 64 64 static struct _ddebug __aligned(8) \
+20 -30
lib/dynamic_debug.c
··· 537 537 return buf; 538 538 } 539 539 540 - int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...) 540 + void __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...) 541 541 { 542 542 va_list args; 543 - int res; 544 543 struct va_format vaf; 545 544 char buf[PREFIX_SIZE]; 546 545 ··· 551 552 vaf.fmt = fmt; 552 553 vaf.va = &args; 553 554 554 - res = printk(KERN_DEBUG "%s%pV", 555 - dynamic_emit_prefix(descriptor, buf), &vaf); 555 + printk(KERN_DEBUG "%s%pV", dynamic_emit_prefix(descriptor, buf), &vaf); 556 556 557 557 va_end(args); 558 - 559 - return res; 560 558 } 561 559 EXPORT_SYMBOL(__dynamic_pr_debug); 562 560 563 - int __dynamic_dev_dbg(struct _ddebug *descriptor, 561 + void __dynamic_dev_dbg(struct _ddebug *descriptor, 564 562 const struct device *dev, const char *fmt, ...) 565 563 { 566 564 struct va_format vaf; 567 565 va_list args; 568 - int res; 569 566 570 567 BUG_ON(!descriptor); 571 568 BUG_ON(!fmt); ··· 572 577 vaf.va = &args; 573 578 574 579 if (!dev) { 575 - res = printk(KERN_DEBUG "(NULL device *): %pV", &vaf); 580 + printk(KERN_DEBUG "(NULL device *): %pV", &vaf); 576 581 } else { 577 582 char buf[PREFIX_SIZE]; 578 583 579 - res = dev_printk_emit(7, dev, "%s%s %s: %pV", 580 - dynamic_emit_prefix(descriptor, buf), 581 - dev_driver_string(dev), dev_name(dev), 582 - &vaf); 584 + dev_printk_emit(7, dev, "%s%s %s: %pV", 585 + dynamic_emit_prefix(descriptor, buf), 586 + dev_driver_string(dev), dev_name(dev), 587 + &vaf); 583 588 } 584 589 585 590 va_end(args); 586 - 587 - return res; 588 591 } 589 592 EXPORT_SYMBOL(__dynamic_dev_dbg); 590 593 591 594 #ifdef CONFIG_NET 592 595 593 - int __dynamic_netdev_dbg(struct _ddebug *descriptor, 594 - const struct net_device *dev, const char *fmt, ...) 596 + void __dynamic_netdev_dbg(struct _ddebug *descriptor, 597 + const struct net_device *dev, const char *fmt, ...) 595 598 { 596 599 struct va_format vaf; 597 600 va_list args; 598 - int res; 599 601 600 602 BUG_ON(!descriptor); 601 603 BUG_ON(!fmt); ··· 605 613 if (dev && dev->dev.parent) { 606 614 char buf[PREFIX_SIZE]; 607 615 608 - res = dev_printk_emit(7, dev->dev.parent, 609 - "%s%s %s %s%s: %pV", 610 - dynamic_emit_prefix(descriptor, buf), 611 - dev_driver_string(dev->dev.parent), 612 - dev_name(dev->dev.parent), 613 - netdev_name(dev), netdev_reg_state(dev), 614 - &vaf); 616 + dev_printk_emit(7, dev->dev.parent, 617 + "%s%s %s %s%s: %pV", 618 + dynamic_emit_prefix(descriptor, buf), 619 + dev_driver_string(dev->dev.parent), 620 + dev_name(dev->dev.parent), 621 + netdev_name(dev), netdev_reg_state(dev), 622 + &vaf); 615 623 } else if (dev) { 616 - res = printk(KERN_DEBUG "%s%s: %pV", netdev_name(dev), 617 - netdev_reg_state(dev), &vaf); 624 + printk(KERN_DEBUG "%s%s: %pV", netdev_name(dev), 625 + netdev_reg_state(dev), &vaf); 618 626 } else { 619 - res = printk(KERN_DEBUG "(NULL net_device): %pV", &vaf); 627 + printk(KERN_DEBUG "(NULL net_device): %pV", &vaf); 620 628 } 621 629 622 630 va_end(args); 623 - 624 - return res; 625 631 } 626 632 EXPORT_SYMBOL(__dynamic_netdev_dbg); 627 633