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

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

USB: remove the auto_pm flag 



This patch (as1302) removes the auto_pm flag from struct usb_device.
The flag's only purpose was to distinguish between autosuspends and
external suspends, but that information is now available in the
pm_message_t argument passed to suspend methods.

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

Documentation/usb/power-management.txt

+5 −4
Original line number Diff line number Diff line
@@ -423,15 +423,16 @@ an URB had completed too recently. 


External suspend calls should never be allowed to fail in this way,

only autosuspend calls.  The driver can tell them apart by checking

udev->auto_pm; this flag will be set to 1 for internal PM events

(autosuspend or autoresume) and 0 for external PM events.

the PM_EVENT_AUTO bit in the message.event argument to the suspend

method; this bit will be set for internal PM events (autosuspend) and

clear for external PM events.



Many of the ingredients in the autosuspend framework are oriented

towards interfaces: The usb_interface structure contains the

pm_usage_cnt field, and the usb_autopm_* routines take an interface

pointer as their argument.  But somewhat confusingly, a few of the

pieces (usb_mark_last_busy() and udev->auto_pm) use the usb_device

structure instead.  Drivers need to keep this straight; they can call

pieces (i.e., usb_mark_last_busy()) use the usb_device structure

instead.  Drivers need to keep this straight; they can call

interface_to_usbdev() to find the device structure for a given

interface.

drivers/bluetooth/btusb.c

+1 −1
Original line number Diff line number Diff line
@@ -1066,7 +1066,7 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message) 
		return 0;



	spin_lock_irq(&data->txlock);

	if (!(interface_to_usbdev(intf)->auto_pm && data->tx_in_flight)) {

	if (!((message.event & PM_EVENT_AUTO) && data->tx_in_flight)) {

		set_bit(BTUSB_SUSPENDING, &data->flags);

		spin_unlock_irq(&data->txlock);

	} else {

drivers/hid/usbhid/hid-core.c

+4 −4
Original line number Diff line number Diff line
@@ -1253,10 +1253,9 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) 
{

	struct hid_device *hid = usb_get_intfdata(intf);

	struct usbhid_device *usbhid = hid->driver_data;

	struct usb_device *udev = interface_to_usbdev(intf);

	int status;



	if (udev->auto_pm) {

	if (message.event & PM_EVENT_AUTO) {

		spin_lock_irq(&usbhid->lock);	/* Sync with error handler */

		if (!test_bit(HID_RESET_PENDING, &usbhid->iofl)

		    && !test_bit(HID_CLEAR_HALT, &usbhid->iofl)
@@ -1281,7 +1280,7 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) 
			return -EIO;

	}



	if (!ignoreled && udev->auto_pm) {

	if (!ignoreled && (message.event & PM_EVENT_AUTO)) {

		spin_lock_irq(&usbhid->lock);

		if (test_bit(HID_LED_ON, &usbhid->iofl)) {

			spin_unlock_irq(&usbhid->lock);
@@ -1294,7 +1293,8 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) 
	hid_cancel_delayed_stuff(usbhid);

	hid_cease_io(usbhid);



	if (udev->auto_pm && test_bit(HID_KEYS_PRESSED, &usbhid->iofl)) {

	if ((message.event & PM_EVENT_AUTO) &&

			test_bit(HID_KEYS_PRESSED, &usbhid->iofl)) {

		/* lost race against keypresses */

		status = hid_start_in(hid);

		if (status < 0)

drivers/net/wimax/i2400m/usb.c

+2 −5
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ void i2400mu_disconnect(struct usb_interface *iface) 
 *

 *    As well, the device might refuse going to sleep for whichever

 *    reason. In this case we just fail. For system suspend/hibernate,

 *    we *can't* fail. We look at usb_dev->auto_pm to see if the

 *    we *can't* fail. We check PM_EVENT_AUTO to see if the

 *    suspend call comes from the USB stack or from the system and act

 *    in consequence.

 *
@@ -591,14 +591,11 @@ int i2400mu_suspend(struct usb_interface *iface, pm_message_t pm_msg) 
	int result = 0;

	struct device *dev = &iface->dev;

	struct i2400mu *i2400mu = usb_get_intfdata(iface);

#ifdef CONFIG_PM

	struct usb_device *usb_dev = i2400mu->usb_dev;

#endif

	unsigned is_autosuspend = 0;

	struct i2400m *i2400m = &i2400mu->i2400m;



#ifdef CONFIG_PM

	if (usb_dev->auto_pm > 0)

	if (pm_msg.event & PM_EVENT_AUTO)

		is_autosuspend = 1;

#endif

drivers/usb/core/driver.c

+0 −4
Original line number Diff line number Diff line
@@ -1341,7 +1341,6 @@ static int usb_autopm_do_device(struct usb_device *udev, int inc_usage_cnt) 
	int	status = 0;



	usb_pm_lock(udev);

	udev->auto_pm = 1;

	udev->pm_usage_cnt += inc_usage_cnt;

	WARN_ON(udev->pm_usage_cnt < 0);

	if (inc_usage_cnt)
@@ -1473,7 +1472,6 @@ static int usb_autopm_do_interface(struct usb_interface *intf, 
	if (intf->condition == USB_INTERFACE_UNBOUND)

		status = -ENODEV;

	else {

		udev->auto_pm = 1;

		atomic_add(inc_usage_cnt, &intf->pm_usage_cnt);

		udev->last_busy = jiffies;

		if (inc_usage_cnt >= 0 &&
@@ -1707,7 +1705,6 @@ int usb_external_suspend_device(struct usb_device *udev, pm_message_t msg) 


	do_unbind_rebind(udev, DO_UNBIND);

	usb_pm_lock(udev);

	udev->auto_pm = 0;

	status = usb_suspend_both(udev, msg);

	usb_pm_unlock(udev);

	return status;
@@ -1730,7 +1727,6 @@ int usb_external_resume_device(struct usb_device *udev, pm_message_t msg) 
	int	status;



	usb_pm_lock(udev);

	udev->auto_pm = 0;

	status = usb_resume_both(udev, msg);

	udev->last_busy = jiffies;

	usb_pm_unlock(udev);