diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-10-15 22:01:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 11:21:31 -0700 |
| commit | c80cfb0406c01bb5da91bfe30f5cb1fd96831138 (patch) | |
| tree | 9f9d382c30457f8553bcd3e4ae5cc03dc2dc120b /drivers/base/power | |
| parent | 404d0ae289f7a76ff233e8fbfde8b1e7b6e62ae3 (diff) | |
| download | linux-3.10-c80cfb0406c01bb5da91bfe30f5cb1fd96831138.tar.gz linux-3.10-c80cfb0406c01bb5da91bfe30f5cb1fd96831138.tar.bz2 linux-3.10-c80cfb0406c01bb5da91bfe30f5cb1fd96831138.zip | |
vsprintf: use new vsprintf symbolic function pointer format
Use the '%pF' format to get rid of an "#ifdef DEBUG" and make some printks
atomic.
This removes the last in-tree uses of print_fn_descriptor_symbol(). I
marked print_fn_descriptor_symbol() deprecated and scheduled it for
removal next year to give time for out-of-tree modules to be updated.
parisc's print_fn_descriptor_symbol() is currently broken there (it needs
to dereference the function pointer similar to ia64 and power). This
patch shouldn't make anything worse, but it means we need to fix
dereference_function_descriptor() instead of print_fn_descriptor_symbol()
to get meaningful initcall_debug output.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/base/power')
| -rw-r--r-- | drivers/base/power/main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 273a944d404..03bde7524bc 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -778,10 +778,7 @@ EXPORT_SYMBOL_GPL(device_suspend); void __suspend_report_result(const char *function, void *fn, int ret) { - if (ret) { - printk(KERN_ERR "%s(): ", function); - print_fn_descriptor_symbol("%s returns ", fn); - printk("%d\n", ret); - } + if (ret) + printk(KERN_ERR "%s(): %pF returns %d\n", function, fn, ret); } EXPORT_SYMBOL_GPL(__suspend_report_result); |