Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20dfdad7 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: rework C++-style comments 



This patch (as911) replaces some C++-style commented-out debugging
lines in driver.c with a new "verbose debugging" macro.  It makes the
code look cleaner, and it's easier to turn the debugging on or off.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d4ead16f

drivers/usb/core/driver.c

+29 −21
Original line number Diff line number Diff line
@@ -29,6 +29,14 @@ 
#include "hcd.h"

#include "usb.h"



#define VERBOSE_DEBUG	0



#if VERBOSE_DEBUG

#define dev_vdbg	dev_dbg

#else

#define dev_vdbg(dev, fmt, args...)	do { } while (0)

#endif



#ifdef CONFIG_HOTPLUG



/*
@@ -813,7 +821,7 @@ static int usb_suspend_device(struct usb_device *udev, pm_message_t msg) 
	status = udriver->suspend(udev, msg);



 done:

	// dev_dbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);

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

	if (status == 0)

		udev->dev.power.power_state.event = msg.event;

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



 done:

	// dev_dbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);

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

	if (status == 0) {

		udev->autoresume_disabled = 0;

		udev->dev.power.power_state.event = PM_EVENT_ON;
@@ -882,7 +890,7 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg) 
	}



 done:

	// dev_dbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status);

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

	return status;

}
@@ -919,7 +927,7 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume) 
				driver->name);



done:

	// dev_dbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status);

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

	if (status == 0)

		mark_active(intf);

	return status;
@@ -1083,7 +1091,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) 
	}



 done:

	// dev_dbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);

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

	return status;

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



 done:

	// dev_dbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);

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

	udev->reset_resume = 0;

	return status;

}
@@ -1248,8 +1256,8 @@ void usb_autosuspend_device(struct usb_device *udev) 
	int	status;



	status = usb_autopm_do_device(udev, -1);

	// dev_dbg(&udev->dev, "%s: cnt %d\n",

	//		__FUNCTION__, udev->pm_usage_cnt);

	dev_vdbg(&udev->dev, "%s: cnt %d\n",

			__FUNCTION__, udev->pm_usage_cnt);

}



/**
@@ -1268,8 +1276,8 @@ void usb_autosuspend_device(struct usb_device *udev) 
void usb_try_autosuspend_device(struct usb_device *udev)

{

	usb_autopm_do_device(udev, 0);

	// dev_dbg(&udev->dev, "%s: cnt %d\n",

	// 		__FUNCTION__, udev->pm_usage_cnt);

	dev_vdbg(&udev->dev, "%s: cnt %d\n",

			__FUNCTION__, udev->pm_usage_cnt);

}



/**
@@ -1296,8 +1304,8 @@ int usb_autoresume_device(struct usb_device *udev) 
	int	status;



	status = usb_autopm_do_device(udev, 1);

	// dev_dbg(&udev->dev, "%s: status %d cnt %d\n",

	//		__FUNCTION__, status, udev->pm_usage_cnt);

	dev_vdbg(&udev->dev, "%s: status %d cnt %d\n",

			__FUNCTION__, status, udev->pm_usage_cnt);

	return status;

}
@@ -1369,8 +1377,8 @@ void usb_autopm_put_interface(struct usb_interface *intf) 
	int	status;



	status = usb_autopm_do_interface(intf, -1);

	// dev_dbg(&intf->dev, "%s: status %d cnt %d\n",

	//		__FUNCTION__, status, intf->pm_usage_cnt);

	dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",

			__FUNCTION__, status, intf->pm_usage_cnt);

}

EXPORT_SYMBOL_GPL(usb_autopm_put_interface);
@@ -1413,8 +1421,8 @@ int usb_autopm_get_interface(struct usb_interface *intf) 
	int	status;



	status = usb_autopm_do_interface(intf, 1);

	// dev_dbg(&intf->dev, "%s: status %d cnt %d\n",

	//		__FUNCTION__, status, intf->pm_usage_cnt);

	dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",

			__FUNCTION__, status, intf->pm_usage_cnt);

	return status;

}

EXPORT_SYMBOL_GPL(usb_autopm_get_interface);
@@ -1435,8 +1443,8 @@ int usb_autopm_set_interface(struct usb_interface *intf) 
	int	status;



	status = usb_autopm_do_interface(intf, 0);

	// dev_dbg(&intf->dev, "%s: status %d cnt %d\n",

	//		__FUNCTION__, status, intf->pm_usage_cnt);

	dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",

			__FUNCTION__, status, intf->pm_usage_cnt);

	return status;

}

EXPORT_SYMBOL_GPL(usb_autopm_set_interface);