diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-05-05 11:36:18 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-05-16 14:45:58 -0400 |
commit | ea3e6c59266b783b103c0f42a8de5dbe565a43d4 (patch) | |
tree | b9dce06a3180e4a64eaa1dd3b45e8e070e39c315 /drivers/input/misc/ati_remote2.c | |
parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) |
Input: 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: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/misc/ati_remote2.c')
-rw-r--r-- | drivers/input/misc/ati_remote2.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c index f2709b82485..a7fabafbd94 100644 --- a/drivers/input/misc/ati_remote2.c +++ b/drivers/input/misc/ati_remote2.c | |||
@@ -137,14 +137,14 @@ static int ati_remote2_open(struct input_dev *idev) | |||
137 | r = usb_submit_urb(ar2->urb[0], GFP_KERNEL); | 137 | r = usb_submit_urb(ar2->urb[0], GFP_KERNEL); |
138 | if (r) { | 138 | if (r) { |
139 | dev_err(&ar2->intf[0]->dev, | 139 | dev_err(&ar2->intf[0]->dev, |
140 | "%s: usb_submit_urb() = %d\n", __FUNCTION__, r); | 140 | "%s: usb_submit_urb() = %d\n", __func__, r); |
141 | return r; | 141 | return r; |
142 | } | 142 | } |
143 | r = usb_submit_urb(ar2->urb[1], GFP_KERNEL); | 143 | r = usb_submit_urb(ar2->urb[1], GFP_KERNEL); |
144 | if (r) { | 144 | if (r) { |
145 | usb_kill_urb(ar2->urb[0]); | 145 | usb_kill_urb(ar2->urb[0]); |
146 | dev_err(&ar2->intf[1]->dev, | 146 | dev_err(&ar2->intf[1]->dev, |
147 | "%s: usb_submit_urb() = %d\n", __FUNCTION__, r); | 147 | "%s: usb_submit_urb() = %d\n", __func__, r); |
148 | return r; | 148 | return r; |
149 | } | 149 | } |
150 | 150 | ||
@@ -294,17 +294,17 @@ static void ati_remote2_complete_mouse(struct urb *urb) | |||
294 | case -ECONNRESET: | 294 | case -ECONNRESET: |
295 | case -ESHUTDOWN: | 295 | case -ESHUTDOWN: |
296 | dev_dbg(&ar2->intf[0]->dev, | 296 | dev_dbg(&ar2->intf[0]->dev, |
297 | "%s(): urb status = %d\n", __FUNCTION__, urb->status); | 297 | "%s(): urb status = %d\n", __func__, urb->status); |
298 | return; | 298 | return; |
299 | default: | 299 | default: |
300 | dev_err(&ar2->intf[0]->dev, | 300 | dev_err(&ar2->intf[0]->dev, |
301 | "%s(): urb status = %d\n", __FUNCTION__, urb->status); | 301 | "%s(): urb status = %d\n", __func__, urb->status); |
302 | } | 302 | } |
303 | 303 | ||
304 | r = usb_submit_urb(urb, GFP_ATOMIC); | 304 | r = usb_submit_urb(urb, GFP_ATOMIC); |
305 | if (r) | 305 | if (r) |
306 | dev_err(&ar2->intf[0]->dev, | 306 | dev_err(&ar2->intf[0]->dev, |
307 | "%s(): usb_submit_urb() = %d\n", __FUNCTION__, r); | 307 | "%s(): usb_submit_urb() = %d\n", __func__, r); |
308 | } | 308 | } |
309 | 309 | ||
310 | static void ati_remote2_complete_key(struct urb *urb) | 310 | static void ati_remote2_complete_key(struct urb *urb) |
@@ -321,17 +321,17 @@ static void ati_remote2_complete_key(struct urb *urb) | |||
321 | case -ECONNRESET: | 321 | case -ECONNRESET: |
322 | case -ESHUTDOWN: | 322 | case -ESHUTDOWN: |
323 | dev_dbg(&ar2->intf[1]->dev, | 323 | dev_dbg(&ar2->intf[1]->dev, |
324 | "%s(): urb status = %d\n", __FUNCTION__, urb->status); | 324 | "%s(): urb status = %d\n", __func__, urb->status); |
325 | return; | 325 | return; |
326 | default: | 326 | default: |
327 | dev_err(&ar2->intf[1]->dev, | 327 | dev_err(&ar2->intf[1]->dev, |
328 | "%s(): urb status = %d\n", __FUNCTION__, urb->status); | 328 | "%s(): urb status = %d\n", __func__, urb->status); |
329 | } | 329 | } |
330 | 330 | ||
331 | r = usb_submit_urb(urb, GFP_ATOMIC); | 331 | r = usb_submit_urb(urb, GFP_ATOMIC); |
332 | if (r) | 332 | if (r) |
333 | dev_err(&ar2->intf[1]->dev, | 333 | dev_err(&ar2->intf[1]->dev, |
334 | "%s(): usb_submit_urb() = %d\n", __FUNCTION__, r); | 334 | "%s(): usb_submit_urb() = %d\n", __func__, r); |
335 | } | 335 | } |
336 | 336 | ||
337 | static int ati_remote2_input_init(struct ati_remote2 *ar2) | 337 | static int ati_remote2_input_init(struct ati_remote2 *ar2) |
@@ -438,7 +438,7 @@ static int ati_remote2_setup(struct ati_remote2 *ar2) | |||
438 | channel, 0x0, NULL, 0, USB_CTRL_SET_TIMEOUT); | 438 | channel, 0x0, NULL, 0, USB_CTRL_SET_TIMEOUT); |
439 | if (r) { | 439 | if (r) { |
440 | dev_err(&ar2->udev->dev, "%s - failed to set channel due to error: %d\n", | 440 | dev_err(&ar2->udev->dev, "%s - failed to set channel due to error: %d\n", |
441 | __FUNCTION__, r); | 441 | __func__, r); |
442 | return r; | 442 | return r; |
443 | } | 443 | } |
444 | 444 | ||