USB: replace remaining __FUNCTION__ occurrences (441b62c1) · Commits · e / devices / android_kernel_teracube_2e

drivers/usb/atm/ueagle-atm.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -83,7 +83,7 @@
	if (debug >= 1) \		if (debug >= 1) \
	dev_dbg(&(usb_dev)->dev, \		dev_dbg(&(usb_dev)->dev, \
	"[ueagle-atm dbg] %s: " format, \		"[ueagle-atm dbg] %s: " format, \
	__FUNCTION__, ##args); \		__func__, ##args); \
	} while (0)		} while (0)

	#define uea_vdbg(usb_dev, format, args...) \		#define uea_vdbg(usb_dev, format, args...) \
	@@ -94,10 +94,10 @@
	} while (0)		} while (0)

	#define uea_enters(usb_dev) \		#define uea_enters(usb_dev) \
	uea_vdbg(usb_dev, "entering %s\n", __FUNCTION__)		uea_vdbg(usb_dev, "entering %s\n", __func__)

	#define uea_leaves(usb_dev) \		#define uea_leaves(usb_dev) \
	uea_vdbg(usb_dev, "leaving %s\n", __FUNCTION__)		uea_vdbg(usb_dev, "leaving %s\n", __func__)

	#define uea_err(usb_dev, format,args...) \		#define uea_err(usb_dev, format,args...) \
	dev_err(&(usb_dev)->dev ,"[UEAGLE-ATM] " format , ##args)		dev_err(&(usb_dev)->dev ,"[UEAGLE-ATM] " format , ##args)

drivers/usb/class/cdc-acm.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -260,10 +260,10 @@ static void acm_ctrl_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__, status);		dbg("%s - urb shutting down with status: %d", __func__, status);
	return;		return;
	default:		default:
	dbg("%s - nonzero urb status received: %d", __FUNCTION__, status);		dbg("%s - nonzero urb status received: %d", __func__, status);
	goto exit;		goto exit;
	}		}

	@@ -307,7 +307,7 @@ static void acm_ctrl_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);
	}		}

	/* data interface returns incoming bytes, or we got unthrottled */		/* data interface returns incoming bytes, or we got unthrottled */

drivers/usb/core/devio.c

+21 −21

Original line number	Original line	Diff line number	Diff line
	@@ -1530,60 +1530,60 @@ static int usbdev_ioctl(struct inode inode, struct file file,

	switch (cmd) {		switch (cmd) {
	case USBDEVFS_CONTROL:		case USBDEVFS_CONTROL:
	snoop(&dev->dev, "%s: CONTROL\n", __FUNCTION__);		snoop(&dev->dev, "%s: CONTROL\n", __func__);
	ret = proc_control(ps, p);		ret = proc_control(ps, p);
	if (ret >= 0)		if (ret >= 0)
	inode->i_mtime = CURRENT_TIME;		inode->i_mtime = CURRENT_TIME;
	break;		break;

	case USBDEVFS_BULK:		case USBDEVFS_BULK:
	snoop(&dev->dev, "%s: BULK\n", __FUNCTION__);		snoop(&dev->dev, "%s: BULK\n", __func__);
	ret = proc_bulk(ps, p);		ret = proc_bulk(ps, p);
	if (ret >= 0)		if (ret >= 0)
	inode->i_mtime = CURRENT_TIME;		inode->i_mtime = CURRENT_TIME;
	break;		break;

	case USBDEVFS_RESETEP:		case USBDEVFS_RESETEP:
	snoop(&dev->dev, "%s: RESETEP\n", __FUNCTION__);		snoop(&dev->dev, "%s: RESETEP\n", __func__);
	ret = proc_resetep(ps, p);		ret = proc_resetep(ps, p);
	if (ret >= 0)		if (ret >= 0)
	inode->i_mtime = CURRENT_TIME;		inode->i_mtime = CURRENT_TIME;
	break;		break;

	case USBDEVFS_RESET:		case USBDEVFS_RESET:
	snoop(&dev->dev, "%s: RESET\n", __FUNCTION__);		snoop(&dev->dev, "%s: RESET\n", __func__);
	ret = proc_resetdevice(ps);		ret = proc_resetdevice(ps);
	break;		break;

	case USBDEVFS_CLEAR_HALT:		case USBDEVFS_CLEAR_HALT:
	snoop(&dev->dev, "%s: CLEAR_HALT\n", __FUNCTION__);		snoop(&dev->dev, "%s: CLEAR_HALT\n", __func__);
	ret = proc_clearhalt(ps, p);		ret = proc_clearhalt(ps, p);
	if (ret >= 0)		if (ret >= 0)
	inode->i_mtime = CURRENT_TIME;		inode->i_mtime = CURRENT_TIME;
	break;		break;

	case USBDEVFS_GETDRIVER:		case USBDEVFS_GETDRIVER:
	snoop(&dev->dev, "%s: GETDRIVER\n", __FUNCTION__);		snoop(&dev->dev, "%s: GETDRIVER\n", __func__);
	ret = proc_getdriver(ps, p);		ret = proc_getdriver(ps, p);
	break;		break;

	case USBDEVFS_CONNECTINFO:		case USBDEVFS_CONNECTINFO:
	snoop(&dev->dev, "%s: CONNECTINFO\n", __FUNCTION__);		snoop(&dev->dev, "%s: CONNECTINFO\n", __func__);
	ret = proc_connectinfo(ps, p);		ret = proc_connectinfo(ps, p);
	break;		break;

	case USBDEVFS_SETINTERFACE:		case USBDEVFS_SETINTERFACE:
	snoop(&dev->dev, "%s: SETINTERFACE\n", __FUNCTION__);		snoop(&dev->dev, "%s: SETINTERFACE\n", __func__);
	ret = proc_setintf(ps, p);		ret = proc_setintf(ps, p);
	break;		break;

	case USBDEVFS_SETCONFIGURATION:		case USBDEVFS_SETCONFIGURATION:
	snoop(&dev->dev, "%s: SETCONFIGURATION\n", __FUNCTION__);		snoop(&dev->dev, "%s: SETCONFIGURATION\n", __func__);
	ret = proc_setconfig(ps, p);		ret = proc_setconfig(ps, p);
	break;		break;

	case USBDEVFS_SUBMITURB:		case USBDEVFS_SUBMITURB:
	snoop(&dev->dev, "%s: SUBMITURB\n", __FUNCTION__);		snoop(&dev->dev, "%s: SUBMITURB\n", __func__);
	ret = proc_submiturb(ps, p);		ret = proc_submiturb(ps, p);
	if (ret >= 0)		if (ret >= 0)
	inode->i_mtime = CURRENT_TIME;		inode->i_mtime = CURRENT_TIME;
	@@ -1592,60 +1592,60 @@ static int usbdev_ioctl(struct inode inode, struct file file,
	#ifdef CONFIG_COMPAT		#ifdef CONFIG_COMPAT

	case USBDEVFS_SUBMITURB32:		case USBDEVFS_SUBMITURB32:
	snoop(&dev->dev, "%s: SUBMITURB32\n", __FUNCTION__);		snoop(&dev->dev, "%s: SUBMITURB32\n", __func__);
	ret = proc_submiturb_compat(ps, p);		ret = proc_submiturb_compat(ps, p);
	if (ret >= 0)		if (ret >= 0)
	inode->i_mtime = CURRENT_TIME;		inode->i_mtime = CURRENT_TIME;
	break;		break;

	case USBDEVFS_REAPURB32:		case USBDEVFS_REAPURB32:
	snoop(&dev->dev, "%s: REAPURB32\n", __FUNCTION__);		snoop(&dev->dev, "%s: REAPURB32\n", __func__);
	ret = proc_reapurb_compat(ps, p);		ret = proc_reapurb_compat(ps, p);
	break;		break;

	case USBDEVFS_REAPURBNDELAY32:		case USBDEVFS_REAPURBNDELAY32:
	snoop(&dev->dev, "%s: REAPURBDELAY32\n", __FUNCTION__);		snoop(&dev->dev, "%s: REAPURBDELAY32\n", __func__);
	ret = proc_reapurbnonblock_compat(ps, p);		ret = proc_reapurbnonblock_compat(ps, p);
	break;		break;

	case USBDEVFS_IOCTL32:		case USBDEVFS_IOCTL32:
	snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__);		snoop(&dev->dev, "%s: IOCTL\n", __func__);
	ret = proc_ioctl_compat(ps, ptr_to_compat(p));		ret = proc_ioctl_compat(ps, ptr_to_compat(p));
	break;		break;
	#endif		#endif

	case USBDEVFS_DISCARDURB:		case USBDEVFS_DISCARDURB:
	snoop(&dev->dev, "%s: DISCARDURB\n", __FUNCTION__);		snoop(&dev->dev, "%s: DISCARDURB\n", __func__);
	ret = proc_unlinkurb(ps, p);		ret = proc_unlinkurb(ps, p);
	break;		break;

	case USBDEVFS_REAPURB:		case USBDEVFS_REAPURB:
	snoop(&dev->dev, "%s: REAPURB\n", __FUNCTION__);		snoop(&dev->dev, "%s: REAPURB\n", __func__);
	ret = proc_reapurb(ps, p);		ret = proc_reapurb(ps, p);
	break;		break;

	case USBDEVFS_REAPURBNDELAY:		case USBDEVFS_REAPURBNDELAY:
	snoop(&dev->dev, "%s: REAPURBDELAY\n", __FUNCTION__);		snoop(&dev->dev, "%s: REAPURBDELAY\n", __func__);
	ret = proc_reapurbnonblock(ps, p);		ret = proc_reapurbnonblock(ps, p);
	break;		break;

	case USBDEVFS_DISCSIGNAL:		case USBDEVFS_DISCSIGNAL:
	snoop(&dev->dev, "%s: DISCSIGNAL\n", __FUNCTION__);		snoop(&dev->dev, "%s: DISCSIGNAL\n", __func__);
	ret = proc_disconnectsignal(ps, p);		ret = proc_disconnectsignal(ps, p);
	break;		break;

	case USBDEVFS_CLAIMINTERFACE:		case USBDEVFS_CLAIMINTERFACE:
	snoop(&dev->dev, "%s: CLAIMINTERFACE\n", __FUNCTION__);		snoop(&dev->dev, "%s: CLAIMINTERFACE\n", __func__);
	ret = proc_claiminterface(ps, p);		ret = proc_claiminterface(ps, p);
	break;		break;

	case USBDEVFS_RELEASEINTERFACE:		case USBDEVFS_RELEASEINTERFACE:
	snoop(&dev->dev, "%s: RELEASEINTERFACE\n", __FUNCTION__);		snoop(&dev->dev, "%s: RELEASEINTERFACE\n", __func__);
	ret = proc_releaseinterface(ps, p);		ret = proc_releaseinterface(ps, p);
	break;		break;

	case USBDEVFS_IOCTL:		case USBDEVFS_IOCTL:
	snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__);		snoop(&dev->dev, "%s: IOCTL\n", __func__);
	ret = proc_ioctl_default(ps, p);		ret = proc_ioctl_default(ps, p);
	break;		break;
	}		}

drivers/usb/core/driver.c

+15 −15

Original line number	Original line	Diff line number	Diff line
	@@ -157,7 +157,7 @@ static int usb_probe_device(struct device *dev)
	struct usb_device *udev;		struct usb_device *udev;
	int error = -ENODEV;		int error = -ENODEV;

	dev_dbg(dev, "%s\n", __FUNCTION__);		dev_dbg(dev, "%s\n", __func__);

	if (!is_usb_device(dev)) /* Sanity check */		if (!is_usb_device(dev)) /* Sanity check */
	return error;		return error;
	@@ -194,7 +194,7 @@ static int usb_probe_interface(struct device *dev)
	const struct usb_device_id *id;		const struct usb_device_id *id;
	int error = -ENODEV;		int error = -ENODEV;

	dev_dbg(dev, "%s\n", __FUNCTION__);		dev_dbg(dev, "%s\n", __func__);

	if (is_usb_device(dev)) /* Sanity check */		if (is_usb_device(dev)) /* Sanity check */
	return error;		return error;
	@@ -211,7 +211,7 @@ static int usb_probe_interface(struct device *dev)
	if (!id)		if (!id)
	id = usb_match_dynamic_id(intf, driver);		id = usb_match_dynamic_id(intf, driver);
	if (id) {		if (id) {
	dev_dbg(dev, "%s - got id\n", __FUNCTION__);		dev_dbg(dev, "%s - got id\n", __func__);

	error = usb_autoresume_device(udev);		error = usb_autoresume_device(udev);
	if (error)		if (error)
	@@ -793,7 +793,7 @@ static int usb_suspend_device(struct usb_device *udev, pm_message_t msg)
	status = udriver->suspend(udev, msg);		status = udriver->suspend(udev, msg);

	done:		done:
	dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);		dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status);
	return status;		return status;
	}		}

	@@ -821,7 +821,7 @@ static int usb_resume_device(struct usb_device *udev)
	status = udriver->resume(udev);		status = udriver->resume(udev);

	done:		done:
	dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);		dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status);
	if (status == 0)		if (status == 0)
	udev->autoresume_disabled = 0;		udev->autoresume_disabled = 0;
	return status;		return status;
	@@ -860,7 +860,7 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
	}		}

	done:		done:
	dev_vdbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status);		dev_vdbg(&intf->dev, "%s: status %d\n", __func__, status);
	return status;		return status;
	}		}

	@@ -910,7 +910,7 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume)
	}		}

	done:		done:
	dev_vdbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status);		dev_vdbg(&intf->dev, "%s: status %d\n", __func__, status);
	if (status == 0)		if (status == 0)
	mark_active(intf);		mark_active(intf);

	@@ -1093,7 +1093,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
	}		}

	done:		done:
	dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);		dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status);
	return status;		return status;
	}		}

	@@ -1187,7 +1187,7 @@ static int usb_resume_both(struct usb_device *udev)
	}		}

	done:		done:
	dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);		dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status);
	if (!status)		if (!status)
	udev->reset_resume = 0;		udev->reset_resume = 0;
	return status;		return status;
	@@ -1257,7 +1257,7 @@ void usb_autosuspend_device(struct usb_device *udev)

	status = usb_autopm_do_device(udev, -1);		status = usb_autopm_do_device(udev, -1);
	dev_vdbg(&udev->dev, "%s: cnt %d\n",		dev_vdbg(&udev->dev, "%s: cnt %d\n",
	__FUNCTION__, udev->pm_usage_cnt);		__func__, udev->pm_usage_cnt);
	}		}

	/**		/**
	@@ -1277,7 +1277,7 @@ void usb_try_autosuspend_device(struct usb_device *udev)
	{		{
	usb_autopm_do_device(udev, 0);		usb_autopm_do_device(udev, 0);
	dev_vdbg(&udev->dev, "%s: cnt %d\n",		dev_vdbg(&udev->dev, "%s: cnt %d\n",
	__FUNCTION__, udev->pm_usage_cnt);		__func__, udev->pm_usage_cnt);
	}		}

	/**		/**
	@@ -1305,7 +1305,7 @@ int usb_autoresume_device(struct usb_device *udev)

	status = usb_autopm_do_device(udev, 1);		status = usb_autopm_do_device(udev, 1);
	dev_vdbg(&udev->dev, "%s: status %d cnt %d\n",		dev_vdbg(&udev->dev, "%s: status %d cnt %d\n",
	__FUNCTION__, status, udev->pm_usage_cnt);		__func__, status, udev->pm_usage_cnt);
	return status;		return status;
	}		}

	@@ -1377,7 +1377,7 @@ void usb_autopm_put_interface(struct usb_interface *intf)

	status = usb_autopm_do_interface(intf, -1);		status = usb_autopm_do_interface(intf, -1);
	dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",		dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",
	__FUNCTION__, status, intf->pm_usage_cnt);		__func__, status, intf->pm_usage_cnt);
	}		}
	EXPORT_SYMBOL_GPL(usb_autopm_put_interface);		EXPORT_SYMBOL_GPL(usb_autopm_put_interface);

	@@ -1421,7 +1421,7 @@ int usb_autopm_get_interface(struct usb_interface *intf)

	status = usb_autopm_do_interface(intf, 1);		status = usb_autopm_do_interface(intf, 1);
	dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",		dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",
	__FUNCTION__, status, intf->pm_usage_cnt);		__func__, status, intf->pm_usage_cnt);
	return status;		return status;
	}		}
	EXPORT_SYMBOL_GPL(usb_autopm_get_interface);		EXPORT_SYMBOL_GPL(usb_autopm_get_interface);
	@@ -1443,7 +1443,7 @@ int usb_autopm_set_interface(struct usb_interface *intf)

	status = usb_autopm_do_interface(intf, 0);		status = usb_autopm_do_interface(intf, 0);
	dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",		dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",
	__FUNCTION__, status, intf->pm_usage_cnt);		__func__, status, intf->pm_usage_cnt);
	return status;		return status;
	}		}
	EXPORT_SYMBOL_GPL(usb_autopm_set_interface);		EXPORT_SYMBOL_GPL(usb_autopm_set_interface);

drivers/usb/core/hub.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -575,7 +575,7 @@ static int hub_hub_status(struct usb_hub *hub,
	ret = get_hub_status(hub->hdev, &hub->status->hub);		ret = get_hub_status(hub->hdev, &hub->status->hub);
	if (ret < 0)		if (ret < 0)
	dev_err (hub->intfdev,		dev_err (hub->intfdev,
	"%s failed (err = %d)\n", __FUNCTION__, ret);		"%s failed (err = %d)\n", __func__, ret);
	else {		else {
	*status = le16_to_cpu(hub->status->hub.wHubStatus);		*status = le16_to_cpu(hub->status->hub.wHubStatus);
	*change = le16_to_cpu(hub->status->hub.wHubChange);		*change = le16_to_cpu(hub->status->hub.wHubChange);
	@@ -1270,7 +1270,7 @@ void usb_disconnect(struct usb_device **pdev)
	int i;		int i;

	if (!udev) {		if (!udev) {
	pr_debug ("%s nodev\n", __FUNCTION__);		pr_debug ("%s nodev\n", __func__);
	return;		return;
	}		}

	@@ -2072,7 +2072,7 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
	}		}
	}		}

	dev_dbg(&intf->dev, "%s\n", __FUNCTION__);		dev_dbg(&intf->dev, "%s\n", __func__);

	/* stop khubd and related activity */		/* stop khubd and related activity */
	hub_quiesce(hub);		hub_quiesce(hub);
	@@ -3125,7 +3125,7 @@ int usb_reset_device(struct usb_device *udev)

	if (!parent_hdev) {		if (!parent_hdev) {
	/* this requires hcd-specific logic; see OHCI hc_restart() */		/* this requires hcd-specific logic; see OHCI hc_restart() */
	dev_dbg(&udev->dev, "%s for root hub!\n", __FUNCTION__);		dev_dbg(&udev->dev, "%s for root hub!\n", __func__);
	return -EISDIR;		return -EISDIR;
	}		}
	parent_hub = hdev_to_hub(parent_hdev);		parent_hub = hdev_to_hub(parent_hdev);