diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-03 19:08:34 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:55 -0400 |
commit | 441b62c1edb986827154768d89bbac0ba779984f (patch) | |
tree | 13724c22d1b190a36f0ddbba38554e6c66bea6af /drivers/usb/gadget/inode.c | |
parent | 14722ef4acedc643f0b78b7165ceff2d300dae4d (diff) |
USB: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/inode.c')
-rw-r--r-- | drivers/usb/gadget/inode.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index 0a6feafc8d28..69b0a2754f2a 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c | |||
@@ -1107,13 +1107,13 @@ scan: | |||
1107 | 1107 | ||
1108 | switch (state) { | 1108 | switch (state) { |
1109 | default: | 1109 | default: |
1110 | DBG (dev, "fail %s, state %d\n", __FUNCTION__, state); | 1110 | DBG (dev, "fail %s, state %d\n", __func__, state); |
1111 | retval = -ESRCH; | 1111 | retval = -ESRCH; |
1112 | break; | 1112 | break; |
1113 | case STATE_DEV_UNCONNECTED: | 1113 | case STATE_DEV_UNCONNECTED: |
1114 | case STATE_DEV_CONNECTED: | 1114 | case STATE_DEV_CONNECTED: |
1115 | spin_unlock_irq (&dev->lock); | 1115 | spin_unlock_irq (&dev->lock); |
1116 | DBG (dev, "%s wait\n", __FUNCTION__); | 1116 | DBG (dev, "%s wait\n", __func__); |
1117 | 1117 | ||
1118 | /* wait for events */ | 1118 | /* wait for events */ |
1119 | retval = wait_event_interruptible (dev->wait, | 1119 | retval = wait_event_interruptible (dev->wait, |
@@ -1222,7 +1222,7 @@ ep0_write (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) | |||
1222 | DBG(dev, "bogus ep0out stall!\n"); | 1222 | DBG(dev, "bogus ep0out stall!\n"); |
1223 | } | 1223 | } |
1224 | } else | 1224 | } else |
1225 | DBG (dev, "fail %s, state %d\n", __FUNCTION__, dev->state); | 1225 | DBG (dev, "fail %s, state %d\n", __func__, dev->state); |
1226 | 1226 | ||
1227 | spin_unlock_irq (&dev->lock); | 1227 | spin_unlock_irq (&dev->lock); |
1228 | return retval; | 1228 | return retval; |
@@ -1233,7 +1233,7 @@ ep0_fasync (int f, struct file *fd, int on) | |||
1233 | { | 1233 | { |
1234 | struct dev_data *dev = fd->private_data; | 1234 | struct dev_data *dev = fd->private_data; |
1235 | // caller must F_SETOWN before signal delivery happens | 1235 | // caller must F_SETOWN before signal delivery happens |
1236 | VDEBUG (dev, "%s %s\n", __FUNCTION__, on ? "on" : "off"); | 1236 | VDEBUG (dev, "%s %s\n", __func__, on ? "on" : "off"); |
1237 | return fasync_helper (f, fd, on, &dev->fasync); | 1237 | return fasync_helper (f, fd, on, &dev->fasync); |
1238 | } | 1238 | } |
1239 | 1239 | ||
@@ -1575,7 +1575,7 @@ static void destroy_ep_files (struct dev_data *dev) | |||
1575 | { | 1575 | { |
1576 | struct list_head *entry, *tmp; | 1576 | struct list_head *entry, *tmp; |
1577 | 1577 | ||
1578 | DBG (dev, "%s %d\n", __FUNCTION__, dev->state); | 1578 | DBG (dev, "%s %d\n", __func__, dev->state); |
1579 | 1579 | ||
1580 | /* dev->state must prevent interference */ | 1580 | /* dev->state must prevent interference */ |
1581 | restart: | 1581 | restart: |
@@ -1662,7 +1662,7 @@ enomem1: | |||
1662 | put_dev (dev); | 1662 | put_dev (dev); |
1663 | kfree (data); | 1663 | kfree (data); |
1664 | enomem0: | 1664 | enomem0: |
1665 | DBG (dev, "%s enomem\n", __FUNCTION__); | 1665 | DBG (dev, "%s enomem\n", __func__); |
1666 | destroy_ep_files (dev); | 1666 | destroy_ep_files (dev); |
1667 | return -ENOMEM; | 1667 | return -ENOMEM; |
1668 | } | 1668 | } |
@@ -1672,7 +1672,7 @@ gadgetfs_unbind (struct usb_gadget *gadget) | |||
1672 | { | 1672 | { |
1673 | struct dev_data *dev = get_gadget_data (gadget); | 1673 | struct dev_data *dev = get_gadget_data (gadget); |
1674 | 1674 | ||
1675 | DBG (dev, "%s\n", __FUNCTION__); | 1675 | DBG (dev, "%s\n", __func__); |
1676 | 1676 | ||
1677 | spin_lock_irq (&dev->lock); | 1677 | spin_lock_irq (&dev->lock); |
1678 | dev->state = STATE_DEV_UNBOUND; | 1678 | dev->state = STATE_DEV_UNBOUND; |
@@ -1685,7 +1685,7 @@ gadgetfs_unbind (struct usb_gadget *gadget) | |||
1685 | /* we've already been disconnected ... no i/o is active */ | 1685 | /* we've already been disconnected ... no i/o is active */ |
1686 | if (dev->req) | 1686 | if (dev->req) |
1687 | usb_ep_free_request (gadget->ep0, dev->req); | 1687 | usb_ep_free_request (gadget->ep0, dev->req); |
1688 | DBG (dev, "%s done\n", __FUNCTION__); | 1688 | DBG (dev, "%s done\n", __func__); |
1689 | put_dev (dev); | 1689 | put_dev (dev); |
1690 | } | 1690 | } |
1691 | 1691 | ||
@@ -1933,7 +1933,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) | |||
1933 | 1933 | ||
1934 | fail: | 1934 | fail: |
1935 | spin_unlock_irq (&dev->lock); | 1935 | spin_unlock_irq (&dev->lock); |
1936 | pr_debug ("%s: %s fail %Zd, %p\n", shortname, __FUNCTION__, value, dev); | 1936 | pr_debug ("%s: %s fail %Zd, %p\n", shortname, __func__, value, dev); |
1937 | kfree (dev->buf); | 1937 | kfree (dev->buf); |
1938 | dev->buf = NULL; | 1938 | dev->buf = NULL; |
1939 | return value; | 1939 | return value; |