Skip to content

Commit

Permalink
Input: replace remaining __FUNCTION__ occurrences
Browse files Browse the repository at this point in the history 
__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>
  • Loading branch information
Harvey Harrison authored and Dmitry Torokhov committed May 16, 2008
1 parent f26a398 commit ea3e6c5
Show file tree
Hide file tree
Showing 14 changed files with 75 additions and 75 deletions.
6 changes: 3 additions & 3 deletions drivers/input/joystick/iforce/iforce-usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ static void iforce_usb_irq(struct urb *urb)
case -ESHUTDOWN:
/* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d",
__FUNCTION__, urb->status);
__func__, urb->status);
return;
default:
dbg("%s - urb has status of: %d", __FUNCTION__, urb->status);
dbg("%s - urb has status of: %d", __func__, urb->status);
goto exit;
}

Expand All @@ -103,7 +103,7 @@ static void iforce_usb_irq(struct urb *urb)
status = usb_submit_urb (urb, GFP_ATOMIC);
if (status)
err ("%s - usb_submit_urb failed with result %d",
__FUNCTION__, status);
__func__, status);
}

static void iforce_usb_out(struct urb *urb)
Expand Down
12 changes: 6 additions & 6 deletions drivers/input/joystick/xpad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,11 +418,11 @@ static void xpad_irq_in(struct urb *urb)
case -ESHUTDOWN:
/* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d",
__FUNCTION__, status);
__func__, status);
return;
default:
dbg("%s - nonzero urb status received: %d",
__FUNCTION__, status);
__func__, status);
goto exit;
}

Expand All @@ -441,7 +441,7 @@ static void xpad_irq_in(struct urb *urb)
retval = usb_submit_urb (urb, GFP_ATOMIC);
if (retval)
err ("%s - usb_submit_urb failed with result %d",
__FUNCTION__, retval);
__func__, retval);
}

static void xpad_bulk_out(struct urb *urb)
Expand Down Expand Up @@ -477,19 +477,19 @@ static void xpad_irq_out(struct urb *urb)
case -ESHUTDOWN:
/* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d",
__FUNCTION__, status);
__func__, status);
return;
default:
dbg("%s - nonzero urb status received: %d",
__FUNCTION__, status);
__func__, status);
goto exit;
}

exit:
retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval)
err("%s - usb_submit_urb failed with result %d",
__FUNCTION__, retval);
__func__, retval);
}

static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)
Expand Down
6 changes: 3 additions & 3 deletions drivers/input/keyboard/lkkbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,11 +538,11 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
switch (code) {
case SND_CLICK:
if (value == 0) {
DBG ("%s: Deactivating key clicks\n", __FUNCTION__);
DBG ("%s: Deactivating key clicks\n", __func__);
lk->serio->write (lk->serio, LK_CMD_DISABLE_KEYCLICK);
lk->serio->write (lk->serio, LK_CMD_DISABLE_CTRCLICK);
} else {
DBG ("%s: Activating key clicks\n", __FUNCTION__);
DBG ("%s: Activating key clicks\n", __func__);
lk->serio->write (lk->serio, LK_CMD_ENABLE_KEYCLICK);
lk->serio->write (lk->serio, volume_to_hw (lk->keyclick_volume));
lk->serio->write (lk->serio, LK_CMD_ENABLE_CTRCLICK);
Expand All @@ -560,7 +560,7 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,

default:
printk (KERN_ERR "%s (): Got unknown type %d, code %d, value %d\n",
__FUNCTION__, type, code, value);
__func__, type, code, value);
}

return -1;
Expand Down
18 changes: 9 additions & 9 deletions drivers/input/misc/ati_remote.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ static int ati_remote_open(struct input_dev *inputdev)
ati_remote->irq_urb->dev = ati_remote->udev;
if (usb_submit_urb(ati_remote->irq_urb, GFP_KERNEL)) {
dev_err(&ati_remote->interface->dev,
"%s: usb_submit_urb failed!\n", __FUNCTION__);
"%s: usb_submit_urb failed!\n", __func__);
return -EIO;
}

Expand All @@ -356,7 +356,7 @@ static void ati_remote_irq_out(struct urb *urb)

if (urb->status) {
dev_dbg(&ati_remote->interface->dev, "%s: status %d\n",
__FUNCTION__, urb->status);
__func__, urb->status);
return;
}

Expand Down Expand Up @@ -601,17 +601,17 @@ static void ati_remote_irq_in(struct urb *urb)
case -ENOENT:
case -ESHUTDOWN:
dev_dbg(&ati_remote->interface->dev, "%s: urb error status, unlink? \n",
__FUNCTION__);
__func__);
return;
default: /* error */
dev_dbg(&ati_remote->interface->dev, "%s: Nonzero urb status %d\n",
__FUNCTION__, urb->status);
__func__, urb->status);
}

retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval)
dev_err(&ati_remote->interface->dev, "%s: usb_submit_urb()=%d\n",
__FUNCTION__, retval);
__func__, retval);
}

/*
Expand Down Expand Up @@ -734,19 +734,19 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
int err = -ENOMEM;

if (iface_host->desc.bNumEndpoints != 2) {
err("%s: Unexpected desc.bNumEndpoints\n", __FUNCTION__);
err("%s: Unexpected desc.bNumEndpoints\n", __func__);
return -ENODEV;
}

endpoint_in = &iface_host->endpoint[0].desc;
endpoint_out = &iface_host->endpoint[1].desc;

if (!usb_endpoint_is_int_in(endpoint_in)) {
err("%s: Unexpected endpoint_in\n", __FUNCTION__);
err("%s: Unexpected endpoint_in\n", __func__);
return -ENODEV;
}
if (le16_to_cpu(endpoint_in->wMaxPacketSize) == 0) {
err("%s: endpoint_in message size==0? \n", __FUNCTION__);
err("%s: endpoint_in message size==0? \n", __func__);
return -ENODEV;
}

Expand Down Expand Up @@ -814,7 +814,7 @@ static void ati_remote_disconnect(struct usb_interface *interface)
ati_remote = usb_get_intfdata(interface);
usb_set_intfdata(interface, NULL);
if (!ati_remote) {
warn("%s - null device?\n", __FUNCTION__);
warn("%s - null device?\n", __func__);
return;
}

Expand Down
18 changes: 9 additions & 9 deletions drivers/input/misc/ati_remote2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,14 @@ static int ati_remote2_open(struct input_dev *idev)
r = usb_submit_urb(ar2->urb[0], GFP_KERNEL);
if (r) {
dev_err(&ar2->intf[0]->dev,
"%s: usb_submit_urb() = %d\n", __FUNCTION__, r);
"%s: usb_submit_urb() = %d\n", __func__, r);
return r;
}
r = usb_submit_urb(ar2->urb[1], GFP_KERNEL);
if (r) {
usb_kill_urb(ar2->urb[0]);
dev_err(&ar2->intf[1]->dev,
"%s: usb_submit_urb() = %d\n", __FUNCTION__, r);
"%s: usb_submit_urb() = %d\n", __func__, r);
return r;
}

Expand Down Expand Up @@ -294,17 +294,17 @@ static void ati_remote2_complete_mouse(struct urb *urb)
case -ECONNRESET:
case -ESHUTDOWN:
dev_dbg(&ar2->intf[0]->dev,
"%s(): urb status = %d\n", __FUNCTION__, urb->status);
"%s(): urb status = %d\n", __func__, urb->status);
return;
default:
dev_err(&ar2->intf[0]->dev,
"%s(): urb status = %d\n", __FUNCTION__, urb->status);
"%s(): urb status = %d\n", __func__, urb->status);
}

r = usb_submit_urb(urb, GFP_ATOMIC);
if (r)
dev_err(&ar2->intf[0]->dev,
"%s(): usb_submit_urb() = %d\n", __FUNCTION__, r);
"%s(): usb_submit_urb() = %d\n", __func__, r);
}

static void ati_remote2_complete_key(struct urb *urb)
Expand All @@ -321,17 +321,17 @@ static void ati_remote2_complete_key(struct urb *urb)
case -ECONNRESET:
case -ESHUTDOWN:
dev_dbg(&ar2->intf[1]->dev,
"%s(): urb status = %d\n", __FUNCTION__, urb->status);
"%s(): urb status = %d\n", __func__, urb->status);
return;
default:
dev_err(&ar2->intf[1]->dev,
"%s(): urb status = %d\n", __FUNCTION__, urb->status);
"%s(): urb status = %d\n", __func__, urb->status);
}

r = usb_submit_urb(urb, GFP_ATOMIC);
if (r)
dev_err(&ar2->intf[1]->dev,
"%s(): usb_submit_urb() = %d\n", __FUNCTION__, r);
"%s(): usb_submit_urb() = %d\n", __func__, r);
}

static int ati_remote2_input_init(struct ati_remote2 *ar2)
Expand Down Expand Up @@ -438,7 +438,7 @@ static int ati_remote2_setup(struct ati_remote2 *ar2)
channel, 0x0, NULL, 0, USB_CTRL_SET_TIMEOUT);
if (r) {
dev_err(&ar2->udev->dev, "%s - failed to set channel due to error: %d\n",
__FUNCTION__, r);
__func__, r);
return r;
}

Expand Down
20 changes: 10 additions & 10 deletions drivers/input/misc/keyspan_remote.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ static int keyspan_load_tester(struct usb_keyspan* dev, int bits_needed)
if (dev->data.pos >= dev->data.len) {
dev_dbg(&dev->udev->dev,
"%s - Error ran out of data. pos: %d, len: %d\n",
__FUNCTION__, dev->data.pos, dev->data.len);
__func__, dev->data.pos, dev->data.len);
return -1;
}

Expand Down Expand Up @@ -267,7 +267,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6;
} else {
err("%s - Unknown sequence found in system data.\n", __FUNCTION__);
err("%s - Unknown sequence found in system data.\n", __func__);
remote->stage = 0;
return;
}
Expand All @@ -286,7 +286,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6;
} else {
err("%s - Unknown sequence found in button data.\n", __FUNCTION__);
err("%s - Unknown sequence found in button data.\n", __func__);
remote->stage = 0;
return;
}
Expand All @@ -302,7 +302,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6;
} else {
err("%s - Error in message, invalid toggle.\n", __FUNCTION__);
err("%s - Error in message, invalid toggle.\n", __func__);
remote->stage = 0;
return;
}
Expand All @@ -317,7 +317,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)

dev_dbg(&remote->udev->dev,
"%s found valid message: system: %d, button: %d, toggle: %d\n",
__FUNCTION__, message.system, message.button, message.toggle);
__func__, message.system, message.button, message.toggle);

if (message.toggle != remote->toggle) {
keyspan_report_button(remote, message.button, 1);
Expand All @@ -341,27 +341,27 @@ static int keyspan_setup(struct usb_device* dev)
0x11, 0x40, 0x5601, 0x0, NULL, 0, 0);
if (retval) {
dev_dbg(&dev->dev, "%s - failed to set bit rate due to error: %d\n",
__FUNCTION__, retval);
__func__, retval);
return(retval);
}

retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
0x44, 0x40, 0x0, 0x0, NULL, 0, 0);
if (retval) {
dev_dbg(&dev->dev, "%s - failed to set resume sensitivity due to error: %d\n",
__FUNCTION__, retval);
__func__, retval);
return(retval);
}

retval = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
0x22, 0x40, 0x0, 0x0, NULL, 0, 0);
if (retval) {
dev_dbg(&dev->dev, "%s - failed to turn receive on due to error: %d\n",
__FUNCTION__, retval);
__func__, retval);
return(retval);
}

dev_dbg(&dev->dev, "%s - Setup complete.\n", __FUNCTION__);
dev_dbg(&dev->dev, "%s - Setup complete.\n", __func__);
return(retval);
}

Expand Down Expand Up @@ -397,7 +397,7 @@ static void keyspan_irq_recv(struct urb *urb)
resubmit:
retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval)
err ("%s - usb_submit_urb failed with result: %d", __FUNCTION__, retval);
err ("%s - usb_submit_urb failed with result: %d", __func__, retval);
}

static int keyspan_open(struct input_dev *dev)
Expand Down
6 changes: 3 additions & 3 deletions drivers/input/misc/powermate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ static void powermate_irq(struct urb *urb)
case -ENOENT:
case -ESHUTDOWN:
/* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
dbg("%s - urb shutting down with status: %d", __func__, urb->status);
return;
default:
dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
dbg("%s - nonzero urb status received: %d", __func__, urb->status);
goto exit;
}

Expand All @@ -112,7 +112,7 @@ static void powermate_irq(struct urb *urb)
retval = usb_submit_urb (urb, GFP_ATOMIC);
if (retval)
err ("%s - usb_submit_urb failed with result %d",
__FUNCTION__, retval);
__func__, retval);
}

/* Decide if we need to issue a control message and do so. Must be called with pm->lock taken */
Expand Down
12 changes: 6 additions & 6 deletions drivers/input/misc/yealink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)
Expand All @@ -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:
Expand All @@ -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);
}

/*******************************************************************************
Expand Down Expand Up @@ -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++)
Expand All @@ -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;
Expand Down
Loading

0 comments on commit ea3e6c5

Please sign in to comment.