leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: dwc3: gadget: use common is_selfpowered

Browse Source 
Delete private selfpowered variable, and use common one.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Peter Chen 2015-01-28 16:32:40 +08:00 committed by Felipe Balbi
parent 716013b0ab
commit bcdea50312
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/dwc3/core.h
View File

@ -682,7 +682,6 @@ struct dwc3_scratchpad_array {
* @is_utmi_l1_suspend: the core asserts output signal * @is_utmi_l1_suspend: the core asserts output signal
* 0 - utmi_sleep_n * 0 - utmi_sleep_n
* 1 - utmi_l1_suspend_n * 1 - utmi_l1_suspend_n
* @is_selfpowered: true when we are selfpowered
* @is_fpga: true when we are using the FPGA board * @is_fpga: true when we are using the FPGA board
* @needs_fifo_resize: not all users might want fifo resizing, flag it * @needs_fifo_resize: not all users might want fifo resizing, flag it
* @pullups_connected: true when Run/Stop bit is set * @pullups_connected: true when Run/Stop bit is set
@ -806,7 +805,6 @@ struct dwc3 {
unsigned has_hibernation:1; unsigned has_hibernation:1;
unsigned has_lpm_erratum:1; unsigned has_lpm_erratum:1;
unsigned is_utmi_l1_suspend:1; unsigned is_utmi_l1_suspend:1;
unsigned is_selfpowered:1;
unsigned is_fpga:1; unsigned is_fpga:1;
unsigned needs_fifo_resize:1; unsigned needs_fifo_resize:1;
unsigned pullups_connected:1; unsigned pullups_connected:1;

2
drivers/usb/dwc3/ep0.c
View File

@ -344,7 +344,7 @@ static int dwc3_ep0_handle_status(struct dwc3 *dwc,
/* /*
* LTM will be set once we know how to set this in HW. * LTM will be set once we know how to set this in HW.
*/ */
usb_status |= dwc->is_selfpowered << USB_DEVICE_SELF_POWERED; usb_status |= dwc->gadget.is_selfpowered;
if (dwc->speed == DWC3_DSTS_SUPERSPEED) { if (dwc->speed == DWC3_DSTS_SUPERSPEED) {
reg = dwc3_readl(dwc->regs, DWC3_DCTL); reg = dwc3_readl(dwc->regs, DWC3_DCTL);

2
drivers/usb/dwc3/gadget.c
View File

@ -1415,7 +1415,7 @@ static int dwc3_gadget_set_selfpowered(struct usb_gadget *g,
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&dwc->lock, flags); spin_lock_irqsave(&dwc->lock, flags);
dwc->is_selfpowered = !!is_selfpowered; g->is_selfpowered = !!is_selfpowered;
spin_unlock_irqrestore(&dwc->lock, flags); spin_unlock_irqrestore(&dwc->lock, flags);
return 0; return 0;