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

USB: remove dev->power.power_state 



power.power_state is scheduled for removal.  This patch (as1053)
removes all uses of that field from drivers/usb.  Almost all of them
were write-only, the most significant exceptions being sl811-hcd.c and
u132-hcd.c.

Part of this patch was written by Pavel Machek.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: David Brownell <david-b@pacbell.net>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e1879b19

drivers/usb/core/driver.c

+4 −8
Original line number Diff line number Diff line
@@ -794,8 +794,6 @@ static int usb_suspend_device(struct usb_device *udev, pm_message_t msg) 


 done:

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

	if (status == 0)

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

	return status;

}
@@ -824,10 +822,8 @@ static int usb_resume_device(struct usb_device *udev) 


 done:

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

	if (status == 0) {

	if (status == 0)

		udev->autoresume_disabled = 0;

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

	}

	return status;

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

	} else {



		/* Needed for setting udev->dev.power.power_state.event,

		 * for possible debugging message, and for reset_resume. */

		/* Needed for reset-resume */

		status = usb_resume_device(udev);

	}
@@ -1194,6 +1189,7 @@ static int usb_resume_both(struct usb_device *udev) 


 done:

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

	if (!status)

		udev->reset_resume = 0;

	return status;

}

drivers/usb/core/hcd-pci.c

+0 −5
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	if (pci_enable_device(dev) < 0)

		return -ENODEV;

	dev->current_state = PCI_D0;

	dev->dev.power.power_state = PMSG_ON;



	if (!dev->irq) {

		dev_err(&dev->dev,
@@ -302,8 +301,6 @@ int usb_hcd_pci_suspend(struct pci_dev *dev, pm_message_t message) 


done:

	if (retval == 0) {

		dev->dev.power.power_state = PMSG_SUSPEND;



#ifdef CONFIG_PPC_PMAC

		/* Disable ASIC clocks for USB */

		if (machine_is(powermac)) {
@@ -406,8 +403,6 @@ int usb_hcd_pci_resume(struct pci_dev *dev) 
	pci_set_master(dev);

	pci_restore_state(dev);



	dev->dev.power.power_state = PMSG_ON;



	clear_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);



	if (hcd->driver->resume) {

drivers/usb/core/usb.h

+0 −2
Original line number Diff line number Diff line
@@ -114,13 +114,11 @@ static inline int is_usb_device_driver(struct device_driver *drv) 
static inline void mark_active(struct usb_interface *f)

{

	f->is_active = 1;

	f->dev.power.power_state.event = PM_EVENT_ON;

}



static inline void mark_quiesced(struct usb_interface *f)

{

	f->is_active = 0;

	f->dev.power.power_state.event = PM_EVENT_SUSPEND;

}



static inline int is_active(const struct usb_interface *f)

drivers/usb/gadget/dummy_hcd.c

+0 −2
Original line number Diff line number Diff line
@@ -900,7 +900,6 @@ static int dummy_udc_suspend (struct platform_device *pdev, pm_message_t state) 
	set_link_state (dum);

	spin_unlock_irq (&dum->lock);



	pdev->dev.power.power_state = state;

	usb_hcd_poll_rh_status (dummy_to_hcd (dum));

	return 0;

}
@@ -915,7 +914,6 @@ static int dummy_udc_resume (struct platform_device *pdev) 
	set_link_state (dum);

	spin_unlock_irq (&dum->lock);



	pdev->dev.power.power_state = PMSG_ON;

	usb_hcd_poll_rh_status (dummy_to_hcd (dum));

	return 0;

}

drivers/usb/gadget/omap_udc.c

+0 −4
Original line number Diff line number Diff line
@@ -1265,8 +1265,6 @@ static int can_pullup(struct omap_udc *udc) 


static void pullup_enable(struct omap_udc *udc)

{

	udc->gadget.dev.parent->power.power_state = PMSG_ON;

	udc->gadget.dev.power.power_state = PMSG_ON;

	UDC_SYSCON1_REG |= UDC_PULLUP_EN;

	if (!gadget_is_otg(&udc->gadget) && !cpu_is_omap15xx())

		OTG_CTRL_REG |= OTG_BSESSVLD;
@@ -3061,8 +3059,6 @@ static int omap_udc_suspend(struct platform_device *dev, pm_message_t message) 
		omap_pullup(&udc->gadget, 0);

	}



	udc->gadget.dev.power.power_state = PMSG_SUSPEND;

	udc->gadget.dev.parent->power.power_state = PMSG_SUSPEND;

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE