diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-17 00:01:10 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2008-04-17 00:01:10 -0400 |
commit | 3371836383d63b627b228875f5ac63023cbf11d2 (patch) | |
tree | b997894d9774bdc07f7df76ceca48e6a848760c8 /drivers/infiniband/hw/ehca | |
parent | e8e91f6b4dc1179a70b0d21241b769c0ebfaa129 (diff) |
IB: Replace remaining __FUNCTION__ occurrences with __func__
__FUNCTION__ is gcc-specific, use __func__ instead.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ehca')
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_tools.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_tools.h b/drivers/infiniband/hw/ehca/ehca_tools.h index 4a8346a2bc9e..ec950bf8c479 100644 --- a/drivers/infiniband/hw/ehca/ehca_tools.h +++ b/drivers/infiniband/hw/ehca/ehca_tools.h | |||
@@ -73,37 +73,37 @@ extern int ehca_debug_level; | |||
73 | if (unlikely(ehca_debug_level)) \ | 73 | if (unlikely(ehca_debug_level)) \ |
74 | dev_printk(KERN_DEBUG, (ib_dev)->dma_device, \ | 74 | dev_printk(KERN_DEBUG, (ib_dev)->dma_device, \ |
75 | "PU%04x EHCA_DBG:%s " format "\n", \ | 75 | "PU%04x EHCA_DBG:%s " format "\n", \ |
76 | raw_smp_processor_id(), __FUNCTION__, \ | 76 | raw_smp_processor_id(), __func__, \ |
77 | ## arg); \ | 77 | ## arg); \ |
78 | } while (0) | 78 | } while (0) |
79 | 79 | ||
80 | #define ehca_info(ib_dev, format, arg...) \ | 80 | #define ehca_info(ib_dev, format, arg...) \ |
81 | dev_info((ib_dev)->dma_device, "PU%04x EHCA_INFO:%s " format "\n", \ | 81 | dev_info((ib_dev)->dma_device, "PU%04x EHCA_INFO:%s " format "\n", \ |
82 | raw_smp_processor_id(), __FUNCTION__, ## arg) | 82 | raw_smp_processor_id(), __func__, ## arg) |
83 | 83 | ||
84 | #define ehca_warn(ib_dev, format, arg...) \ | 84 | #define ehca_warn(ib_dev, format, arg...) \ |
85 | dev_warn((ib_dev)->dma_device, "PU%04x EHCA_WARN:%s " format "\n", \ | 85 | dev_warn((ib_dev)->dma_device, "PU%04x EHCA_WARN:%s " format "\n", \ |
86 | raw_smp_processor_id(), __FUNCTION__, ## arg) | 86 | raw_smp_processor_id(), __func__, ## arg) |
87 | 87 | ||
88 | #define ehca_err(ib_dev, format, arg...) \ | 88 | #define ehca_err(ib_dev, format, arg...) \ |
89 | dev_err((ib_dev)->dma_device, "PU%04x EHCA_ERR:%s " format "\n", \ | 89 | dev_err((ib_dev)->dma_device, "PU%04x EHCA_ERR:%s " format "\n", \ |
90 | raw_smp_processor_id(), __FUNCTION__, ## arg) | 90 | raw_smp_processor_id(), __func__, ## arg) |
91 | 91 | ||
92 | /* use this one only if no ib_dev available */ | 92 | /* use this one only if no ib_dev available */ |
93 | #define ehca_gen_dbg(format, arg...) \ | 93 | #define ehca_gen_dbg(format, arg...) \ |
94 | do { \ | 94 | do { \ |
95 | if (unlikely(ehca_debug_level)) \ | 95 | if (unlikely(ehca_debug_level)) \ |
96 | printk(KERN_DEBUG "PU%04x EHCA_DBG:%s " format "\n", \ | 96 | printk(KERN_DEBUG "PU%04x EHCA_DBG:%s " format "\n", \ |
97 | raw_smp_processor_id(), __FUNCTION__, ## arg); \ | 97 | raw_smp_processor_id(), __func__, ## arg); \ |
98 | } while (0) | 98 | } while (0) |
99 | 99 | ||
100 | #define ehca_gen_warn(format, arg...) \ | 100 | #define ehca_gen_warn(format, arg...) \ |
101 | printk(KERN_INFO "PU%04x EHCA_WARN:%s " format "\n", \ | 101 | printk(KERN_INFO "PU%04x EHCA_WARN:%s " format "\n", \ |
102 | raw_smp_processor_id(), __FUNCTION__, ## arg) | 102 | raw_smp_processor_id(), __func__, ## arg) |
103 | 103 | ||
104 | #define ehca_gen_err(format, arg...) \ | 104 | #define ehca_gen_err(format, arg...) \ |
105 | printk(KERN_ERR "PU%04x EHCA_ERR:%s " format "\n", \ | 105 | printk(KERN_ERR "PU%04x EHCA_ERR:%s " format "\n", \ |
106 | raw_smp_processor_id(), __FUNCTION__, ## arg) | 106 | raw_smp_processor_id(), __func__, ## arg) |
107 | 107 | ||
108 | /** | 108 | /** |
109 | * ehca_dmp - printk a memory block, whose length is n*8 bytes. | 109 | * ehca_dmp - printk a memory block, whose length is n*8 bytes. |
@@ -118,7 +118,7 @@ extern int ehca_debug_level; | |||
118 | for (x = 0; x < l; x += 16) { \ | 118 | for (x = 0; x < l; x += 16) { \ |
119 | printk(KERN_INFO "EHCA_DMP:%s " format \ | 119 | printk(KERN_INFO "EHCA_DMP:%s " format \ |
120 | " adr=%p ofs=%04x %016lx %016lx\n", \ | 120 | " adr=%p ofs=%04x %016lx %016lx\n", \ |
121 | __FUNCTION__, ##args, deb, x, \ | 121 | __func__, ##args, deb, x, \ |
122 | *((u64 *)&deb[0]), *((u64 *)&deb[8])); \ | 122 | *((u64 *)&deb[0]), *((u64 *)&deb[8])); \ |
123 | deb += 16; \ | 123 | deb += 16; \ |
124 | } \ | 124 | } \ |