summaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/yealink.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-05-05 11:36:18 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-05-16 14:45:58 -0400
commitea3e6c59266b783b103c0f42a8de5dbe565a43d4 (patch)
treeb9dce06a3180e4a64eaa1dd3b45e8e070e39c315 /drivers/input/misc/yealink.c
parentf26a3988917913b3d11b2bd741601a2c64ab9204 (diff)
downloadtalos-op-linux-ea3e6c59266b783b103c0f42a8de5dbe565a43d4.tar.gz
talos-op-linux-ea3e6c59266b783b103c0f42a8de5dbe565a43d4.zip
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/yealink.c')
-rw-r--r--drivers/input/misc/yealink.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index 46279ef2b649..8a949e7d8f4e 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -427,7 +427,7 @@ static void urb_irq_callback(struct urb *urb)
int ret;
if (urb->status)
- err("%s - urb status %d", __FUNCTION__, urb->status);
+ err("%s - urb status %d", __func__, urb->status);
switch (yld->irq_data->cmd) {
case CMD_KEYPRESS:
@@ -449,7 +449,7 @@ static void urb_irq_callback(struct urb *urb)
ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
if (ret)
- err("%s - usb_submit_urb failed %d", __FUNCTION__, ret);
+ err("%s - usb_submit_urb failed %d", __func__, ret);
}
static void urb_ctl_callback(struct urb *urb)
@@ -458,7 +458,7 @@ static void urb_ctl_callback(struct urb *urb)
int ret;
if (urb->status)
- err("%s - urb status %d", __FUNCTION__, urb->status);
+ err("%s - urb status %d", __func__, urb->status);
switch (yld->ctl_data->cmd) {
case CMD_KEYPRESS:
@@ -473,7 +473,7 @@ static void urb_ctl_callback(struct urb *urb)
}
if (ret)
- err("%s - usb_submit_urb failed %d", __FUNCTION__, ret);
+ err("%s - usb_submit_urb failed %d", __func__, ret);
}
/*******************************************************************************
@@ -505,7 +505,7 @@ static int input_open(struct input_dev *dev)
struct yealink_dev *yld = input_get_drvdata(dev);
int i, ret;
- dbg("%s", __FUNCTION__);
+ dbg("%s", __func__);
/* force updates to device */
for (i = 0; i<sizeof(yld->master); i++)
@@ -521,7 +521,7 @@ static int input_open(struct input_dev *dev)
yld->ctl_data->sum = 0x100-CMD_INIT-10;
if ((ret = usb_submit_urb(yld->urb_ctl, GFP_KERNEL)) != 0) {
dbg("%s - usb_submit_urb failed with result %d",
- __FUNCTION__, ret);
+ __func__, ret);
return ret;
}
return 0;
OpenPOWER on IntegriCloud