Commit 27d72e85 authored by David Brownell's avatar David Brownell Committed by Greg K-H
Browse files

[PATCH] usb suspend updates (interface suspend) 



This is the first of a few installments of PM API updates to match the
recent switch to "pm_message_t".  This installment primarily affects
USB device drivers (for USB interfaces), and it changes the handful of
drivers which currently implement suspend methods:

    - <linux/usb.h> and usbcore, signature change

    - Some drivers only changed the signature, net effect this just
      shuts up "sparse -Wbitwise":
	* hid-core
	* stir4200

    - Two network drivers did that, and also grew slightly more
      featureful suspend code ... they now properly shut down
      their activities.  (As should stir4200...)
	* pegasus
	* usbnet

Note that the Wake-On-Lan (WOL) support in pegasus doesn't yet work; looks
to me like it's missing a request to turn it on, vs just configuring it.
The ASIX code in usbnet also has WOL hooks that are ready to use; untested.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>

Index: gregkh-2.6/drivers/net/irda/stir4200.c
===================================================================
parent c6053ecf

drivers/net/irda/stir4200.c

+2 −2
Original line number Diff line number Diff line
@@ -1128,8 +1128,8 @@ static void stir_disconnect(struct usb_interface *intf) 
}



#ifdef CONFIG_PM

/* Power management suspend, so power off the transmitter/receiver */

static int stir_suspend(struct usb_interface *intf, u32 state)

/* USB suspend, so power off the transmitter/receiver */

static int stir_suspend(struct usb_interface *intf, pm_message_t message)

{

	struct stir_cb *stir = usb_get_intfdata(intf);

drivers/usb/core/hub.c

+2 −2
Original line number Diff line number Diff line
@@ -1731,7 +1731,7 @@ static int finish_port_resume(struct usb_device *udev) 
			struct usb_driver	*driver;



			intf = udev->actconfig->interface[i];

			if (intf->dev.power.power_state == PM_SUSPEND_ON)

			if (intf->dev.power.power_state == PMSG_SUSPEND)

				continue;

			if (!intf->dev.driver) {

				/* FIXME maybe force to alt 0 */
@@ -1745,7 +1745,7 @@ static int finish_port_resume(struct usb_device *udev) 


			/* can we do better than just logging errors? */

			status = driver->resume(intf);

			if (intf->dev.power.power_state != PM_SUSPEND_ON

			if (intf->dev.power.power_state != PMSG_ON

					|| status)

				dev_dbg(&intf->dev,

					"resume fail, state %d code %d\n",

drivers/usb/core/usb.c

+3 −3
Original line number Diff line number Diff line
@@ -1382,13 +1382,13 @@ void usb_buffer_unmap_sg (struct usb_device *dev, unsigned pipe, 
			usb_pipein (pipe) ? DMA_FROM_DEVICE : DMA_TO_DEVICE);

}



static int usb_generic_suspend(struct device *dev, u32 state)

static int usb_generic_suspend(struct device *dev, pm_message_t message)

{

	struct usb_interface *intf;

	struct usb_driver *driver;



	if (dev->driver == &usb_generic_driver)

		return usb_suspend_device (to_usb_device(dev), state);

		return usb_suspend_device (to_usb_device(dev), message);



	if ((dev->driver == NULL) ||

	    (dev->driver_data == &usb_generic_driver_data))
@@ -1402,7 +1402,7 @@ static int usb_generic_suspend(struct device *dev, u32 state) 
		return 0;



	if (driver->suspend)

		return driver->suspend(intf, state);

		return driver->suspend(intf, message);

	return 0;

}

drivers/usb/input/hid-core.c

+3 −3
Original line number Diff line number Diff line
@@ -1790,12 +1790,12 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	return 0;

}



static int hid_suspend(struct usb_interface *intf, u32 state)

static int hid_suspend(struct usb_interface *intf, pm_message_t message)

{

	struct hid_device *hid = usb_get_intfdata (intf);



	usb_kill_urb(hid->urbin);

	intf->dev.power.power_state = state;

	intf->dev.power.power_state = PMSG_SUSPEND;

	dev_dbg(&intf->dev, "suspend\n");

	return 0;

}
@@ -1805,7 +1805,7 @@ static int hid_resume(struct usb_interface *intf) 
	struct hid_device *hid = usb_get_intfdata (intf);

	int status;



	intf->dev.power.power_state = PM_SUSPEND_ON;

	intf->dev.power.power_state = PMSG_ON;

	if (hid->open)

		status = usb_submit_urb(hid->urbin, GFP_NOIO);

	else

drivers/usb/net/pegasus.c

+21 −1
Original line number Diff line number Diff line
@@ -1364,11 +1364,18 @@ static void pegasus_disconnect(struct usb_interface *intf) 
	free_netdev(pegasus->net);

}



static int pegasus_suspend (struct usb_interface *intf, pm_message_t state)

static int pegasus_suspend (struct usb_interface *intf, pm_message_t message)

{

	struct pegasus *pegasus = usb_get_intfdata(intf);

	

	netif_device_detach (pegasus->net);

	if (netif_running(pegasus->net)) {

		cancel_delayed_work(&pegasus->carrier_check);



		usb_kill_urb(pegasus->rx_urb);

		usb_kill_urb(pegasus->intr_urb);

	}

	intf->dev.power.power_state = PMSG_SUSPEND;

	return 0;

}
@@ -1376,7 +1383,20 @@ static int pegasus_resume (struct usb_interface *intf) 
{

	struct pegasus *pegasus = usb_get_intfdata(intf);



	intf->dev.power.power_state = PMSG_ON;

	netif_device_attach (pegasus->net);

	if (netif_running(pegasus->net)) {

		pegasus->rx_urb->status = 0;

		pegasus->rx_urb->actual_length = 0;

		read_bulk_callback(pegasus->rx_urb, 0);



		pegasus->intr_urb->status = 0;

		pegasus->intr_urb->actual_length = 0;

		intr_callback(pegasus->intr_urb, 0);



		queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,

					CARRIER_CHECK_DELAY);

	}

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE