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>
This commit is contained in:
Harvey Harrison 2008-05-05 11:36:18 -04:00 committed by Dmitry Torokhov
parent f26a398891
commit ea3e6c5926
14 changed files with 75 additions and 75 deletions

View File

@ -89,10 +89,10 @@ static void iforce_usb_irq(struct urb *urb)
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", dbg("%s - urb shutting down with status: %d",
__FUNCTION__, urb->status); __func__, urb->status);
return; return;
default: default:
dbg("%s - urb has status of: %d", __FUNCTION__, urb->status); dbg("%s - urb has status of: %d", __func__, urb->status);
goto exit; goto exit;
} }
@ -103,7 +103,7 @@ exit:
status = usb_submit_urb (urb, GFP_ATOMIC); status = usb_submit_urb (urb, GFP_ATOMIC);
if (status) if (status)
err ("%s - usb_submit_urb failed with result %d", err ("%s - usb_submit_urb failed with result %d",
__FUNCTION__, status); __func__, status);
} }
static void iforce_usb_out(struct urb *urb) static void iforce_usb_out(struct urb *urb)

View File

@ -418,11 +418,11 @@ static void xpad_irq_in(struct urb *urb)
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", dbg("%s - urb shutting down with status: %d",
__FUNCTION__, status); __func__, status);
return; return;
default: default:
dbg("%s - nonzero urb status received: %d", dbg("%s - nonzero urb status received: %d",
__FUNCTION__, status); __func__, status);
goto exit; goto exit;
} }
@ -441,7 +441,7 @@ exit:
retval = usb_submit_urb (urb, GFP_ATOMIC); retval = usb_submit_urb (urb, GFP_ATOMIC);
if (retval) if (retval)
err ("%s - usb_submit_urb failed with result %d", err ("%s - usb_submit_urb failed with result %d",
__FUNCTION__, retval); __func__, retval);
} }
static void xpad_bulk_out(struct urb *urb) static void xpad_bulk_out(struct urb *urb)
@ -477,11 +477,11 @@ static void xpad_irq_out(struct urb *urb)
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", dbg("%s - urb shutting down with status: %d",
__FUNCTION__, status); __func__, status);
return; return;
default: default:
dbg("%s - nonzero urb status received: %d", dbg("%s - nonzero urb status received: %d",
__FUNCTION__, status); __func__, status);
goto exit; goto exit;
} }
@ -489,7 +489,7 @@ exit:
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
err("%s - usb_submit_urb failed with result %d", 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) static int xpad_init_output(struct usb_interface *intf, struct usb_xpad *xpad)

View File

@ -538,11 +538,11 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
switch (code) { switch (code) {
case SND_CLICK: case SND_CLICK:
if (value == 0) { 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_KEYCLICK);
lk->serio->write (lk->serio, LK_CMD_DISABLE_CTRCLICK); lk->serio->write (lk->serio, LK_CMD_DISABLE_CTRCLICK);
} else { } 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, LK_CMD_ENABLE_KEYCLICK);
lk->serio->write (lk->serio, volume_to_hw (lk->keyclick_volume)); lk->serio->write (lk->serio, volume_to_hw (lk->keyclick_volume));
lk->serio->write (lk->serio, LK_CMD_ENABLE_CTRCLICK); lk->serio->write (lk->serio, LK_CMD_ENABLE_CTRCLICK);
@ -560,7 +560,7 @@ lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code,
default: default:
printk (KERN_ERR "%s (): Got unknown type %d, code %d, value %d\n", printk (KERN_ERR "%s (): Got unknown type %d, code %d, value %d\n",
__FUNCTION__, type, code, value); __func__, type, code, value);
} }
return -1; return -1;

View File

@ -330,7 +330,7 @@ static int ati_remote_open(struct input_dev *inputdev)
ati_remote->irq_urb->dev = ati_remote->udev; ati_remote->irq_urb->dev = ati_remote->udev;
if (usb_submit_urb(ati_remote->irq_urb, GFP_KERNEL)) { if (usb_submit_urb(ati_remote->irq_urb, GFP_KERNEL)) {
dev_err(&ati_remote->interface->dev, dev_err(&ati_remote->interface->dev,
"%s: usb_submit_urb failed!\n", __FUNCTION__); "%s: usb_submit_urb failed!\n", __func__);
return -EIO; return -EIO;
} }
@ -356,7 +356,7 @@ static void ati_remote_irq_out(struct urb *urb)
if (urb->status) { if (urb->status) {
dev_dbg(&ati_remote->interface->dev, "%s: status %d\n", dev_dbg(&ati_remote->interface->dev, "%s: status %d\n",
__FUNCTION__, urb->status); __func__, urb->status);
return; return;
} }
@ -601,17 +601,17 @@ static void ati_remote_irq_in(struct urb *urb)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
dev_dbg(&ati_remote->interface->dev, "%s: urb error status, unlink? \n", dev_dbg(&ati_remote->interface->dev, "%s: urb error status, unlink? \n",
__FUNCTION__); __func__);
return; return;
default: /* error */ default: /* error */
dev_dbg(&ati_remote->interface->dev, "%s: Nonzero urb status %d\n", 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); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
dev_err(&ati_remote->interface->dev, "%s: usb_submit_urb()=%d\n", dev_err(&ati_remote->interface->dev, "%s: usb_submit_urb()=%d\n",
__FUNCTION__, retval); __func__, retval);
} }
/* /*
@ -734,7 +734,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
int err = -ENOMEM; int err = -ENOMEM;
if (iface_host->desc.bNumEndpoints != 2) { if (iface_host->desc.bNumEndpoints != 2) {
err("%s: Unexpected desc.bNumEndpoints\n", __FUNCTION__); err("%s: Unexpected desc.bNumEndpoints\n", __func__);
return -ENODEV; return -ENODEV;
} }
@ -742,11 +742,11 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
endpoint_out = &iface_host->endpoint[1].desc; endpoint_out = &iface_host->endpoint[1].desc;
if (!usb_endpoint_is_int_in(endpoint_in)) { if (!usb_endpoint_is_int_in(endpoint_in)) {
err("%s: Unexpected endpoint_in\n", __FUNCTION__); err("%s: Unexpected endpoint_in\n", __func__);
return -ENODEV; return -ENODEV;
} }
if (le16_to_cpu(endpoint_in->wMaxPacketSize) == 0) { 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; return -ENODEV;
} }
@ -814,7 +814,7 @@ static void ati_remote_disconnect(struct usb_interface *interface)
ati_remote = usb_get_intfdata(interface); ati_remote = usb_get_intfdata(interface);
usb_set_intfdata(interface, NULL); usb_set_intfdata(interface, NULL);
if (!ati_remote) { if (!ati_remote) {
warn("%s - null device?\n", __FUNCTION__); warn("%s - null device?\n", __func__);
return; return;
} }

View File

@ -137,14 +137,14 @@ static int ati_remote2_open(struct input_dev *idev)
r = usb_submit_urb(ar2->urb[0], GFP_KERNEL); r = usb_submit_urb(ar2->urb[0], GFP_KERNEL);
if (r) { if (r) {
dev_err(&ar2->intf[0]->dev, dev_err(&ar2->intf[0]->dev,
"%s: usb_submit_urb() = %d\n", __FUNCTION__, r); "%s: usb_submit_urb() = %d\n", __func__, r);
return r; return r;
} }
r = usb_submit_urb(ar2->urb[1], GFP_KERNEL); r = usb_submit_urb(ar2->urb[1], GFP_KERNEL);
if (r) { if (r) {
usb_kill_urb(ar2->urb[0]); usb_kill_urb(ar2->urb[0]);
dev_err(&ar2->intf[1]->dev, dev_err(&ar2->intf[1]->dev,
"%s: usb_submit_urb() = %d\n", __FUNCTION__, r); "%s: usb_submit_urb() = %d\n", __func__, r);
return r; return r;
} }
@ -294,17 +294,17 @@ static void ati_remote2_complete_mouse(struct urb *urb)
case -ECONNRESET: case -ECONNRESET:
case -ESHUTDOWN: case -ESHUTDOWN:
dev_dbg(&ar2->intf[0]->dev, dev_dbg(&ar2->intf[0]->dev,
"%s(): urb status = %d\n", __FUNCTION__, urb->status); "%s(): urb status = %d\n", __func__, urb->status);
return; return;
default: default:
dev_err(&ar2->intf[0]->dev, 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); r = usb_submit_urb(urb, GFP_ATOMIC);
if (r) if (r)
dev_err(&ar2->intf[0]->dev, 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) static void ati_remote2_complete_key(struct urb *urb)
@ -321,17 +321,17 @@ static void ati_remote2_complete_key(struct urb *urb)
case -ECONNRESET: case -ECONNRESET:
case -ESHUTDOWN: case -ESHUTDOWN:
dev_dbg(&ar2->intf[1]->dev, dev_dbg(&ar2->intf[1]->dev,
"%s(): urb status = %d\n", __FUNCTION__, urb->status); "%s(): urb status = %d\n", __func__, urb->status);
return; return;
default: default:
dev_err(&ar2->intf[1]->dev, 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); r = usb_submit_urb(urb, GFP_ATOMIC);
if (r) if (r)
dev_err(&ar2->intf[1]->dev, 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) static int ati_remote2_input_init(struct ati_remote2 *ar2)
@ -438,7 +438,7 @@ static int ati_remote2_setup(struct ati_remote2 *ar2)
channel, 0x0, NULL, 0, USB_CTRL_SET_TIMEOUT); channel, 0x0, NULL, 0, USB_CTRL_SET_TIMEOUT);
if (r) { if (r) {
dev_err(&ar2->udev->dev, "%s - failed to set channel due to error: %d\n", dev_err(&ar2->udev->dev, "%s - failed to set channel due to error: %d\n",
__FUNCTION__, r); __func__, r);
return r; return r;
} }

View File

@ -159,7 +159,7 @@ static int keyspan_load_tester(struct usb_keyspan* dev, int bits_needed)
if (dev->data.pos >= dev->data.len) { if (dev->data.pos >= dev->data.len) {
dev_dbg(&dev->udev->dev, dev_dbg(&dev->udev->dev,
"%s - Error ran out of data. pos: %d, len: %d\n", "%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; return -1;
} }
@ -267,7 +267,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6; remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6; remote->data.bits_left -= 6;
} else { } else {
err("%s - Unknown sequence found in system data.\n", __FUNCTION__); err("%s - Unknown sequence found in system data.\n", __func__);
remote->stage = 0; remote->stage = 0;
return; return;
} }
@ -286,7 +286,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6; remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6; remote->data.bits_left -= 6;
} else { } else {
err("%s - Unknown sequence found in button data.\n", __FUNCTION__); err("%s - Unknown sequence found in button data.\n", __func__);
remote->stage = 0; remote->stage = 0;
return; return;
} }
@ -302,7 +302,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
remote->data.tester = remote->data.tester >> 6; remote->data.tester = remote->data.tester >> 6;
remote->data.bits_left -= 6; remote->data.bits_left -= 6;
} else { } else {
err("%s - Error in message, invalid toggle.\n", __FUNCTION__); err("%s - Error in message, invalid toggle.\n", __func__);
remote->stage = 0; remote->stage = 0;
return; return;
} }
@ -317,7 +317,7 @@ static void keyspan_check_data(struct usb_keyspan *remote)
dev_dbg(&remote->udev->dev, dev_dbg(&remote->udev->dev,
"%s found valid message: system: %d, button: %d, toggle: %d\n", "%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) { if (message.toggle != remote->toggle) {
keyspan_report_button(remote, message.button, 1); keyspan_report_button(remote, message.button, 1);
@ -341,7 +341,7 @@ static int keyspan_setup(struct usb_device* dev)
0x11, 0x40, 0x5601, 0x0, NULL, 0, 0); 0x11, 0x40, 0x5601, 0x0, NULL, 0, 0);
if (retval) { if (retval) {
dev_dbg(&dev->dev, "%s - failed to set bit rate due to error: %d\n", dev_dbg(&dev->dev, "%s - failed to set bit rate due to error: %d\n",
__FUNCTION__, retval); __func__, retval);
return(retval); return(retval);
} }
@ -349,7 +349,7 @@ static int keyspan_setup(struct usb_device* dev)
0x44, 0x40, 0x0, 0x0, NULL, 0, 0); 0x44, 0x40, 0x0, 0x0, NULL, 0, 0);
if (retval) { if (retval) {
dev_dbg(&dev->dev, "%s - failed to set resume sensitivity due to error: %d\n", dev_dbg(&dev->dev, "%s - failed to set resume sensitivity due to error: %d\n",
__FUNCTION__, retval); __func__, retval);
return(retval); return(retval);
} }
@ -357,11 +357,11 @@ static int keyspan_setup(struct usb_device* dev)
0x22, 0x40, 0x0, 0x0, NULL, 0, 0); 0x22, 0x40, 0x0, 0x0, NULL, 0, 0);
if (retval) { if (retval) {
dev_dbg(&dev->dev, "%s - failed to turn receive on due to error: %d\n", dev_dbg(&dev->dev, "%s - failed to turn receive on due to error: %d\n",
__FUNCTION__, retval); __func__, retval);
return(retval); return(retval);
} }
dev_dbg(&dev->dev, "%s - Setup complete.\n", __FUNCTION__); dev_dbg(&dev->dev, "%s - Setup complete.\n", __func__);
return(retval); return(retval);
} }
@ -397,7 +397,7 @@ static void keyspan_irq_recv(struct urb *urb)
resubmit: resubmit:
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) 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) static int keyspan_open(struct input_dev *dev)

View File

@ -96,10 +96,10 @@ static void powermate_irq(struct urb *urb)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* 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; return;
default: default:
dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); dbg("%s - nonzero urb status received: %d", __func__, urb->status);
goto exit; goto exit;
} }
@ -112,7 +112,7 @@ exit:
retval = usb_submit_urb (urb, GFP_ATOMIC); retval = usb_submit_urb (urb, GFP_ATOMIC);
if (retval) if (retval)
err ("%s - usb_submit_urb failed with result %d", 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 */ /* Decide if we need to issue a control message and do so. Must be called with pm->lock taken */

View File

@ -427,7 +427,7 @@ static void urb_irq_callback(struct urb *urb)
int ret; int ret;
if (urb->status) if (urb->status)
err("%s - urb status %d", __FUNCTION__, urb->status); err("%s - urb status %d", __func__, urb->status);
switch (yld->irq_data->cmd) { switch (yld->irq_data->cmd) {
case CMD_KEYPRESS: case CMD_KEYPRESS:
@ -449,7 +449,7 @@ static void urb_irq_callback(struct urb *urb)
ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC); ret = usb_submit_urb(yld->urb_ctl, GFP_ATOMIC);
if (ret) 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) static void urb_ctl_callback(struct urb *urb)
@ -458,7 +458,7 @@ static void urb_ctl_callback(struct urb *urb)
int ret; int ret;
if (urb->status) if (urb->status)
err("%s - urb status %d", __FUNCTION__, urb->status); err("%s - urb status %d", __func__, urb->status);
switch (yld->ctl_data->cmd) { switch (yld->ctl_data->cmd) {
case CMD_KEYPRESS: case CMD_KEYPRESS:
@ -473,7 +473,7 @@ static void urb_ctl_callback(struct urb *urb)
} }
if (ret) 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); struct yealink_dev *yld = input_get_drvdata(dev);
int i, ret; int i, ret;
dbg("%s", __FUNCTION__); dbg("%s", __func__);
/* force updates to device */ /* force updates to device */
for (i = 0; i<sizeof(yld->master); i++) 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; yld->ctl_data->sum = 0x100-CMD_INIT-10;
if ((ret = usb_submit_urb(yld->urb_ctl, GFP_KERNEL)) != 0) { if ((ret = usb_submit_urb(yld->urb_ctl, GFP_KERNEL)) != 0) {
dbg("%s - usb_submit_urb failed with result %d", dbg("%s - usb_submit_urb failed with result %d",
__FUNCTION__, ret); __func__, ret);
return ret; return ret;
} }
return 0; return 0;

View File

@ -287,7 +287,7 @@ static void atp_reinit(struct work_struct *work)
retval = usb_submit_urb(dev->urb, GFP_ATOMIC); retval = usb_submit_urb(dev->urb, GFP_ATOMIC);
if (retval) { if (retval) {
err("%s - usb_submit_urb failed with result %d", err("%s - usb_submit_urb failed with result %d",
__FUNCTION__, retval); __func__, retval);
} }
} }
@ -379,11 +379,11 @@ static void atp_complete(struct urb* urb)
case -ESHUTDOWN: case -ESHUTDOWN:
/* This urb is terminated, clean up */ /* This urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", dbg("%s - urb shutting down with status: %d",
__FUNCTION__, urb->status); __func__, urb->status);
return; return;
default: default:
dbg("%s - nonzero urb status received: %d", dbg("%s - nonzero urb status received: %d",
__FUNCTION__, urb->status); __func__, urb->status);
goto exit; goto exit;
} }
@ -565,7 +565,7 @@ exit:
retval = usb_submit_urb(dev->urb, GFP_ATOMIC); retval = usb_submit_urb(dev->urb, GFP_ATOMIC);
if (retval) { if (retval) {
err("%s - usb_submit_urb failed with result %d", err("%s - usb_submit_urb failed with result %d",
__FUNCTION__, retval); __func__, retval);
} }
} }

View File

@ -73,10 +73,10 @@ static void usb_acecad_irq(struct urb *urb)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* 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; return;
default: default:
dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); dbg("%s - nonzero urb status received: %d", __func__, urb->status);
goto resubmit; goto resubmit;
} }

View File

@ -449,12 +449,12 @@ static void aiptek_irq(struct urb *urb)
case -ESHUTDOWN: case -ESHUTDOWN:
/* This urb is terminated, clean up */ /* This urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", dbg("%s - urb shutting down with status: %d",
__FUNCTION__, urb->status); __func__, urb->status);
return; return;
default: default:
dbg("%s - nonzero urb status received: %d", dbg("%s - nonzero urb status received: %d",
__FUNCTION__, urb->status); __func__, urb->status);
goto exit; goto exit;
} }
@ -813,7 +813,7 @@ exit:
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval != 0) { if (retval != 0) {
err("%s - usb_submit_urb failed with result %d", err("%s - usb_submit_urb failed with result %d",
__FUNCTION__, retval); __func__, retval);
} }
} }

View File

@ -56,10 +56,10 @@ static void kbtab_irq(struct urb *urb)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* 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; return;
default: default:
dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); dbg("%s - nonzero urb status received: %d", __func__, urb->status);
goto exit; goto exit;
} }
@ -88,7 +88,7 @@ static void kbtab_irq(struct urb *urb)
retval = usb_submit_urb (urb, GFP_ATOMIC); retval = usb_submit_urb (urb, GFP_ATOMIC);
if (retval) if (retval)
err ("%s - usb_submit_urb failed with result %d", err ("%s - usb_submit_urb failed with result %d",
__FUNCTION__, retval); __func__, retval);
} }
static struct usb_device_id kbtab_ids[] = { static struct usb_device_id kbtab_ids[] = {

View File

@ -56,10 +56,10 @@ static void wacom_sys_irq(struct urb *urb)
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* 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; return;
default: default:
dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); dbg("%s - nonzero urb status received: %d", __func__, urb->status);
goto exit; goto exit;
} }
@ -74,7 +74,7 @@ static void wacom_sys_irq(struct urb *urb)
retval = usb_submit_urb (urb, GFP_ATOMIC); retval = usb_submit_urb (urb, GFP_ATOMIC);
if (retval) if (retval)
err ("%s - usb_submit_urb failed with result %d", err ("%s - usb_submit_urb failed with result %d",
__FUNCTION__, retval); __func__, retval);
} }
void wacom_report_key(void *wcombo, unsigned int key_type, int key_data) void wacom_report_key(void *wcombo, unsigned int key_type, int key_data)

View File

@ -262,7 +262,7 @@ static int mtouch_init(struct usbtouch_usb *usbtouch)
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
1, 0, NULL, 0, USB_CTRL_SET_TIMEOUT); 1, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
dbg("%s - usb_control_msg - MTOUCHUSB_RESET - bytes|err: %d", dbg("%s - usb_control_msg - MTOUCHUSB_RESET - bytes|err: %d",
__FUNCTION__, ret); __func__, ret);
if (ret < 0) if (ret < 0)
return ret; return ret;
msleep(150); msleep(150);
@ -273,7 +273,7 @@ static int mtouch_init(struct usbtouch_usb *usbtouch)
USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
1, 1, NULL, 0, USB_CTRL_SET_TIMEOUT); 1, 1, NULL, 0, USB_CTRL_SET_TIMEOUT);
dbg("%s - usb_control_msg - MTOUCHUSB_ASYNC_REPORT - bytes|err: %d", dbg("%s - usb_control_msg - MTOUCHUSB_ASYNC_REPORT - bytes|err: %d",
__FUNCTION__, ret); __func__, ret);
if (ret >= 0) if (ret >= 0)
break; break;
if (ret != -EPIPE) if (ret != -EPIPE)
@ -793,18 +793,18 @@ static void usbtouch_irq(struct urb *urb)
case -ETIME: case -ETIME:
/* this urb is timing out */ /* this urb is timing out */
dbg("%s - urb timed out - was the device unplugged?", dbg("%s - urb timed out - was the device unplugged?",
__FUNCTION__); __func__);
return; return;
case -ECONNRESET: case -ECONNRESET:
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: case -ESHUTDOWN:
/* this urb is terminated, clean up */ /* this urb is terminated, clean up */
dbg("%s - urb shutting down with status: %d", dbg("%s - urb shutting down with status: %d",
__FUNCTION__, urb->status); __func__, urb->status);
return; return;
default: default:
dbg("%s - nonzero urb status received: %d", dbg("%s - nonzero urb status received: %d",
__FUNCTION__, urb->status); __func__, urb->status);
goto exit; goto exit;
} }
@ -814,7 +814,7 @@ exit:
retval = usb_submit_urb(urb, GFP_ATOMIC); retval = usb_submit_urb(urb, GFP_ATOMIC);
if (retval) if (retval)
err("%s - usb_submit_urb failed with result: %d", err("%s - usb_submit_urb failed with result: %d",
__FUNCTION__, retval); __func__, retval);
} }
static int usbtouch_open(struct input_dev *input) static int usbtouch_open(struct input_dev *input)
@ -883,7 +883,7 @@ static int usbtouch_probe(struct usb_interface *intf,
usbtouch->irq = usb_alloc_urb(0, GFP_KERNEL); usbtouch->irq = usb_alloc_urb(0, GFP_KERNEL);
if (!usbtouch->irq) { if (!usbtouch->irq) {
dbg("%s - usb_alloc_urb failed: usbtouch->irq", __FUNCTION__); dbg("%s - usb_alloc_urb failed: usbtouch->irq", __func__);
goto out_free_buffers; goto out_free_buffers;
} }
@ -939,14 +939,14 @@ static int usbtouch_probe(struct usb_interface *intf,
if (type->init) { if (type->init) {
err = type->init(usbtouch); err = type->init(usbtouch);
if (err) { if (err) {
dbg("%s - type->init() failed, err: %d", __FUNCTION__, err); dbg("%s - type->init() failed, err: %d", __func__, err);
goto out_free_buffers; goto out_free_buffers;
} }
} }
err = input_register_device(usbtouch->input); err = input_register_device(usbtouch->input);
if (err) { if (err) {
dbg("%s - input_register_device failed, err: %d", __FUNCTION__, err); dbg("%s - input_register_device failed, err: %d", __func__, err);
goto out_free_buffers; goto out_free_buffers;
} }
@ -966,12 +966,12 @@ static void usbtouch_disconnect(struct usb_interface *intf)
{ {
struct usbtouch_usb *usbtouch = usb_get_intfdata(intf); struct usbtouch_usb *usbtouch = usb_get_intfdata(intf);
dbg("%s - called", __FUNCTION__); dbg("%s - called", __func__);
if (!usbtouch) if (!usbtouch)
return; return;
dbg("%s - usbtouch is initialized, cleaning up", __FUNCTION__); dbg("%s - usbtouch is initialized, cleaning up", __func__);
usb_set_intfdata(intf, NULL); usb_set_intfdata(intf, NULL);
usb_kill_urb(usbtouch->irq); usb_kill_urb(usbtouch->irq);
input_unregister_device(usbtouch->input); input_unregister_device(usbtouch->input);