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/tablet | |
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/tablet')
-rw-r--r-- | drivers/input/tablet/acecad.c | 4 | ||||
-rw-r--r-- | drivers/input/tablet/aiptek.c | 6 | ||||
-rw-r--r-- | drivers/input/tablet/kbtab.c | 6 | ||||
-rw-r--r-- | drivers/input/tablet/wacom_sys.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/drivers/input/tablet/acecad.c b/drivers/input/tablet/acecad.c index b973d0ef6d16..570e0e83ac46 100644 --- a/drivers/input/tablet/acecad.c +++ b/drivers/input/tablet/acecad.c | |||
@@ -73,10 +73,10 @@ static void usb_acecad_irq(struct urb *urb) | |||
73 | case -ENOENT: | 73 | case -ENOENT: |
74 | case -ESHUTDOWN: | 74 | case -ESHUTDOWN: |
75 | /* this urb is terminated, clean up */ | 75 | /* this urb is terminated, clean up */ |
76 | dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); | 76 | dbg("%s - urb shutting down with status: %d", __func__, urb->status); |
77 | return; | 77 | return; |
78 | default: | 78 | default: |
79 | dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); | 79 | dbg("%s - nonzero urb status received: %d", __func__, urb->status); |
80 | goto resubmit; | 80 | goto resubmit; |
81 | } | 81 | } |
82 | 82 | ||
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c index 55c1134d6137..8f037a1d44a6 100644 --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c | |||
@@ -449,12 +449,12 @@ static void aiptek_irq(struct urb *urb) | |||
449 | case -ESHUTDOWN: | 449 | case -ESHUTDOWN: |
450 | /* This urb is terminated, clean up */ | 450 | /* This urb is terminated, clean up */ |
451 | dbg("%s - urb shutting down with status: %d", | 451 | dbg("%s - urb shutting down with status: %d", |
452 | __FUNCTION__, urb->status); | 452 | __func__, urb->status); |
453 | return; | 453 | return; |
454 | 454 | ||
455 | default: | 455 | default: |
456 | dbg("%s - nonzero urb status received: %d", | 456 | dbg("%s - nonzero urb status received: %d", |
457 | __FUNCTION__, urb->status); | 457 | __func__, urb->status); |
458 | goto exit; | 458 | goto exit; |
459 | } | 459 | } |
460 | 460 | ||
@@ -813,7 +813,7 @@ exit: | |||
813 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 813 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
814 | if (retval != 0) { | 814 | if (retval != 0) { |
815 | err("%s - usb_submit_urb failed with result %d", | 815 | err("%s - usb_submit_urb failed with result %d", |
816 | __FUNCTION__, retval); | 816 | __func__, retval); |
817 | } | 817 | } |
818 | } | 818 | } |
819 | 819 | ||
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c index f23f5a97fb38..d89112fa6e6b 100644 --- a/drivers/input/tablet/kbtab.c +++ b/drivers/input/tablet/kbtab.c | |||
@@ -56,10 +56,10 @@ static void kbtab_irq(struct urb *urb) | |||
56 | case -ENOENT: | 56 | case -ENOENT: |
57 | case -ESHUTDOWN: | 57 | case -ESHUTDOWN: |
58 | /* this urb is terminated, clean up */ | 58 | /* this urb is terminated, clean up */ |
59 | dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); | 59 | dbg("%s - urb shutting down with status: %d", __func__, urb->status); |
60 | return; | 60 | return; |
61 | default: | 61 | default: |
62 | dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); | 62 | dbg("%s - nonzero urb status received: %d", __func__, urb->status); |
63 | goto exit; | 63 | goto exit; |
64 | } | 64 | } |
65 | 65 | ||
@@ -88,7 +88,7 @@ static void kbtab_irq(struct urb *urb) | |||
88 | retval = usb_submit_urb (urb, GFP_ATOMIC); | 88 | retval = usb_submit_urb (urb, GFP_ATOMIC); |
89 | if (retval) | 89 | if (retval) |
90 | err ("%s - usb_submit_urb failed with result %d", | 90 | err ("%s - usb_submit_urb failed with result %d", |
91 | __FUNCTION__, retval); | 91 | __func__, retval); |
92 | } | 92 | } |
93 | 93 | ||
94 | static struct usb_device_id kbtab_ids[] = { | 94 | static struct usb_device_id kbtab_ids[] = { |
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 71cc0c140790..5fbc463baf5a 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c | |||
@@ -56,10 +56,10 @@ static void wacom_sys_irq(struct urb *urb) | |||
56 | case -ENOENT: | 56 | case -ENOENT: |
57 | case -ESHUTDOWN: | 57 | case -ESHUTDOWN: |
58 | /* this urb is terminated, clean up */ | 58 | /* this urb is terminated, clean up */ |
59 | dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); | 59 | dbg("%s - urb shutting down with status: %d", __func__, urb->status); |
60 | return; | 60 | return; |
61 | default: | 61 | default: |
62 | dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); | 62 | dbg("%s - nonzero urb status received: %d", __func__, urb->status); |
63 | goto exit; | 63 | goto exit; |
64 | } | 64 | } |
65 | 65 | ||
@@ -74,7 +74,7 @@ static void wacom_sys_irq(struct urb *urb) | |||
74 | retval = usb_submit_urb (urb, GFP_ATOMIC); | 74 | retval = usb_submit_urb (urb, GFP_ATOMIC); |
75 | if (retval) | 75 | if (retval) |
76 | err ("%s - usb_submit_urb failed with result %d", | 76 | err ("%s - usb_submit_urb failed with result %d", |
77 | __FUNCTION__, retval); | 77 | __func__, retval); |
78 | } | 78 | } |
79 | 79 | ||
80 | void wacom_report_key(void *wcombo, unsigned int key_type, int key_data) | 80 | void wacom_report_key(void *wcombo, unsigned int key_type, int key_data) |