Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 906d201530f2c52aeb4eee31895c71cdccf1e9a0

Authored by Joe Perches
Committed by Greg Kroah-Hartman
1 parent 33ead538f6
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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>

Showing 2 changed files with 26 additions and 36 deletions Side-by-side Diff

include/linux/dynamic_debug.h
Diff comments   View file @ 906d201
... ... @@ -42,7 +42,7 @@
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);
49 49  
... ... @@ -50,15 +50,15 @@
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) \
... ... @@ -537,10 +537,9 @@
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  
547 546  
548 547  
549 548  
... ... @@ -552,21 +551,17 @@
552 551 vaf.fmt = fmt;
553 552 vaf.va = &args;
554 553  
555   - res = printk(KERN_DEBUG "%s%pV",
556   - dynamic_emit_prefix(descriptor, buf), &vaf);
  554 + printk(KERN_DEBUG "%s%pV", dynamic_emit_prefix(descriptor, buf), &vaf);
557 555  
558 556 va_end(args);
559   -
560   - return res;
561 557 }
562 558 EXPORT_SYMBOL(__dynamic_pr_debug);
563 559  
564   -int __dynamic_dev_dbg(struct _ddebug *descriptor,
  560 +void __dynamic_dev_dbg(struct _ddebug *descriptor,
565 561 const struct device *dev, const char *fmt, ...)
566 562 {
567 563 struct va_format vaf;
568 564 va_list args;
569   - int res;
570 565  
571 566 BUG_ON(!descriptor);
572 567 BUG_ON(!fmt);
573 568  
574 569  
575 570  
576 571  
... ... @@ -577,30 +572,27 @@
577 572 vaf.va = &args;
578 573  
579 574 if (!dev) {
580   - res = printk(KERN_DEBUG "(NULL device *): %pV", &vaf);
  575 + printk(KERN_DEBUG "(NULL device *): %pV", &vaf);
581 576 } else {
582 577 char buf[PREFIX_SIZE];
583 578  
584   - res = 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);
  579 + 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);
588 583 }
589 584  
590 585 va_end(args);
591   -
592   - return res;
593 586 }
594 587 EXPORT_SYMBOL(__dynamic_dev_dbg);
595 588  
596 589 #ifdef CONFIG_NET
597 590  
598   -int __dynamic_netdev_dbg(struct _ddebug *descriptor,
599   - const struct net_device *dev, const char *fmt, ...)
  591 +void __dynamic_netdev_dbg(struct _ddebug *descriptor,
  592 + const struct net_device *dev, const char *fmt, ...)
600 593 {
601 594 struct va_format vaf;
602 595 va_list args;
603   - int res;
604 596  
605 597 BUG_ON(!descriptor);
606 598 BUG_ON(!fmt);
607 599  
608 600  
609 601  
... ... @@ -613,23 +605,21 @@
613 605 if (dev && dev->dev.parent) {
614 606 char buf[PREFIX_SIZE];
615 607  
616   - res = 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);
  608 + 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);
623 615 } else if (dev) {
624   - res = printk(KERN_DEBUG "%s%s: %pV", netdev_name(dev),
625   - netdev_reg_state(dev), &vaf);
  616 + printk(KERN_DEBUG "%s%s: %pV", netdev_name(dev),
  617 + netdev_reg_state(dev), &vaf);
626 618 } else {
627   - res = printk(KERN_DEBUG "(NULL net_device): %pV", &vaf);
  619 + printk(KERN_DEBUG "(NULL net_device): %pV", &vaf);
628 620 }
629 621  
630 622 va_end(args);
631   -
632   - return res;
633 623 }
634 624 EXPORT_SYMBOL(__dynamic_netdev_dbg);
635 625