diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-29 03:59:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:03 -0400 |
commit | 6e574195b75543bc6a6240306313988b1952470c (patch) | |
tree | 510fb98e64cee409cf1f443391cadb5dc1e53aa3 /drivers/misc/ibmasm | |
parent | eecd58536a97502153d4a2bd6f05038f657a1ab3 (diff) |
drivers/misc: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/ibmasm')
-rw-r--r-- | drivers/misc/ibmasm/command.c | 6 | ||||
-rw-r--r-- | drivers/misc/ibmasm/heartbeat.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/misc/ibmasm/command.c b/drivers/misc/ibmasm/command.c index 1a0e7978226a..276d3fb68094 100644 --- a/drivers/misc/ibmasm/command.c +++ b/drivers/misc/ibmasm/command.c | |||
@@ -96,7 +96,7 @@ static inline void do_exec_command(struct service_processor *sp) | |||
96 | { | 96 | { |
97 | char tsbuf[32]; | 97 | char tsbuf[32]; |
98 | 98 | ||
99 | dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf)); | 99 | dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf)); |
100 | 100 | ||
101 | if (ibmasm_send_i2o_message(sp)) { | 101 | if (ibmasm_send_i2o_message(sp)) { |
102 | sp->current_command->status = IBMASM_CMD_FAILED; | 102 | sp->current_command->status = IBMASM_CMD_FAILED; |
@@ -119,7 +119,7 @@ void ibmasm_exec_command(struct service_processor *sp, struct command *cmd) | |||
119 | unsigned long flags; | 119 | unsigned long flags; |
120 | char tsbuf[32]; | 120 | char tsbuf[32]; |
121 | 121 | ||
122 | dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf)); | 122 | dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf)); |
123 | 123 | ||
124 | spin_lock_irqsave(&sp->lock, flags); | 124 | spin_lock_irqsave(&sp->lock, flags); |
125 | 125 | ||
@@ -139,7 +139,7 @@ static void exec_next_command(struct service_processor *sp) | |||
139 | unsigned long flags; | 139 | unsigned long flags; |
140 | char tsbuf[32]; | 140 | char tsbuf[32]; |
141 | 141 | ||
142 | dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf)); | 142 | dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf)); |
143 | 143 | ||
144 | spin_lock_irqsave(&sp->lock, flags); | 144 | spin_lock_irqsave(&sp->lock, flags); |
145 | sp->current_command = dequeue_command(sp); | 145 | sp->current_command = dequeue_command(sp); |
diff --git a/drivers/misc/ibmasm/heartbeat.c b/drivers/misc/ibmasm/heartbeat.c index 3036e785b3e4..1bc4306572a4 100644 --- a/drivers/misc/ibmasm/heartbeat.c +++ b/drivers/misc/ibmasm/heartbeat.c | |||
@@ -75,9 +75,9 @@ void ibmasm_heartbeat_exit(struct service_processor *sp) | |||
75 | { | 75 | { |
76 | char tsbuf[32]; | 76 | char tsbuf[32]; |
77 | 77 | ||
78 | dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf)); | 78 | dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf)); |
79 | ibmasm_wait_for_response(sp->heartbeat, IBMASM_CMD_TIMEOUT_NORMAL); | 79 | ibmasm_wait_for_response(sp->heartbeat, IBMASM_CMD_TIMEOUT_NORMAL); |
80 | dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf)); | 80 | dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf)); |
81 | suspend_heartbeats = 1; | 81 | suspend_heartbeats = 1; |
82 | command_put(sp->heartbeat); | 82 | command_put(sp->heartbeat); |
83 | } | 83 | } |
@@ -88,7 +88,7 @@ void ibmasm_receive_heartbeat(struct service_processor *sp, void *message, size | |||
88 | struct dot_command_header *header = (struct dot_command_header *)cmd->buffer; | 88 | struct dot_command_header *header = (struct dot_command_header *)cmd->buffer; |
89 | char tsbuf[32]; | 89 | char tsbuf[32]; |
90 | 90 | ||
91 | dbg("%s:%d at %s\n", __FUNCTION__, __LINE__, get_timestamp(tsbuf)); | 91 | dbg("%s:%d at %s\n", __func__, __LINE__, get_timestamp(tsbuf)); |
92 | if (suspend_heartbeats) | 92 | if (suspend_heartbeats) |
93 | return; | 93 | return; |
94 | 94 | ||