aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda/irda_device.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-05 23:47:47 -0500
committerDavid S. Miller <davem@davemloft.net>2008-03-05 23:47:47 -0500
commit0dc47877a3de00ceadea0005189656ae8dc52669 (patch)
tree7440a87385fe318cb42f0ae161be195f5e967d82 /net/irda/irda_device.c
parent6387c4bed539539b05fa773cf2ff26529dc3074c (diff)
net: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/irda_device.c')
-rw-r--r--net/irda/irda_device.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c
index 87185910d0ee..ea319e3ddc18 100644
--- a/net/irda/irda_device.c
+++ b/net/irda/irda_device.c
@@ -90,7 +90,7 @@ static void leftover_dongle(void *arg)
90 90
91void irda_device_cleanup(void) 91void irda_device_cleanup(void)
92{ 92{
93 IRDA_DEBUG(4, "%s()\n", __FUNCTION__); 93 IRDA_DEBUG(4, "%s()\n", __func__);
94 94
95 hashbin_delete(tasks, (FREE_FUNC) __irda_task_delete); 95 hashbin_delete(tasks, (FREE_FUNC) __irda_task_delete);
96 96
@@ -107,7 +107,7 @@ void irda_device_set_media_busy(struct net_device *dev, int status)
107{ 107{
108 struct irlap_cb *self; 108 struct irlap_cb *self;
109 109
110 IRDA_DEBUG(4, "%s(%s)\n", __FUNCTION__, status ? "TRUE" : "FALSE"); 110 IRDA_DEBUG(4, "%s(%s)\n", __func__, status ? "TRUE" : "FALSE");
111 111
112 self = (struct irlap_cb *) dev->atalk_ptr; 112 self = (struct irlap_cb *) dev->atalk_ptr;
113 113
@@ -147,11 +147,11 @@ int irda_device_is_receiving(struct net_device *dev)
147 struct if_irda_req req; 147 struct if_irda_req req;
148 int ret; 148 int ret;
149 149
150 IRDA_DEBUG(2, "%s()\n", __FUNCTION__); 150 IRDA_DEBUG(2, "%s()\n", __func__);
151 151
152 if (!dev->do_ioctl) { 152 if (!dev->do_ioctl) {
153 IRDA_ERROR("%s: do_ioctl not impl. by device driver\n", 153 IRDA_ERROR("%s: do_ioctl not impl. by device driver\n",
154 __FUNCTION__); 154 __func__);
155 return -1; 155 return -1;
156 } 156 }
157 157
@@ -191,7 +191,7 @@ static int irda_task_kick(struct irda_task *task)
191 int count = 0; 191 int count = 0;
192 int timeout; 192 int timeout;
193 193
194 IRDA_DEBUG(2, "%s()\n", __FUNCTION__); 194 IRDA_DEBUG(2, "%s()\n", __func__);
195 195
196 IRDA_ASSERT(task != NULL, return -1;); 196 IRDA_ASSERT(task != NULL, return -1;);
197 IRDA_ASSERT(task->magic == IRDA_TASK_MAGIC, return -1;); 197 IRDA_ASSERT(task->magic == IRDA_TASK_MAGIC, return -1;);
@@ -201,14 +201,14 @@ static int irda_task_kick(struct irda_task *task)
201 timeout = task->function(task); 201 timeout = task->function(task);
202 if (count++ > 100) { 202 if (count++ > 100) {
203 IRDA_ERROR("%s: error in task handler!\n", 203 IRDA_ERROR("%s: error in task handler!\n",
204 __FUNCTION__); 204 __func__);
205 irda_task_delete(task); 205 irda_task_delete(task);
206 return TRUE; 206 return TRUE;
207 } 207 }
208 } while ((timeout == 0) && (task->state != IRDA_TASK_DONE)); 208 } while ((timeout == 0) && (task->state != IRDA_TASK_DONE));
209 209
210 if (timeout < 0) { 210 if (timeout < 0) {
211 IRDA_ERROR("%s: Error executing task!\n", __FUNCTION__); 211 IRDA_ERROR("%s: Error executing task!\n", __func__);
212 irda_task_delete(task); 212 irda_task_delete(task);
213 return TRUE; 213 return TRUE;
214 } 214 }
@@ -241,7 +241,7 @@ static int irda_task_kick(struct irda_task *task)
241 finished = FALSE; 241 finished = FALSE;
242 } else { 242 } else {
243 IRDA_DEBUG(0, "%s(), not finished, and no timeout!\n", 243 IRDA_DEBUG(0, "%s(), not finished, and no timeout!\n",
244 __FUNCTION__); 244 __func__);
245 finished = FALSE; 245 finished = FALSE;
246 } 246 }
247 247
@@ -258,7 +258,7 @@ static void irda_task_timer_expired(void *data)
258{ 258{
259 struct irda_task *task; 259 struct irda_task *task;
260 260
261 IRDA_DEBUG(2, "%s()\n", __FUNCTION__); 261 IRDA_DEBUG(2, "%s()\n", __func__);
262 262
263 task = (struct irda_task *) data; 263 task = (struct irda_task *) data;
264 264