diff options
| author | Peter Chen <peter.chen@freescale.com> | 2015-01-28 09:32:41 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-01-29 17:35:43 +0100 |
| commit | dadac9861f466635c3ac0851f2a39be68fa10a71 (patch) | |
| tree | 0ac4f329d7c25b75dc20da8a504774a51ebee1be | |
| parent | usb: dwc3: gadget: use common is_selfpowered (diff) | |
| download | linux-dadac9861f466635c3ac0851f2a39be68fa10a71.tar.xz linux-dadac9861f466635c3ac0851f2a39be68fa10a71.zip | |
usb: musb: gadget: use common is_selfpowered
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>
| -rw-r--r-- | drivers/usb/musb/musb_gadget.c | 4 | ||||
| -rw-r--r-- | drivers/usb/musb/musb_gadget_ep0.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 49b04cb6f5ca..b2d9040c7685 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -1612,9 +1612,7 @@ done: static int musb_gadget_set_self_powered(struct usb_gadget *gadget, int is_selfpowered) { - struct musb *musb = gadget_to_musb(gadget); - - musb->is_self_powered = !!is_selfpowered; + gadget->is_selfpowered = !!is_selfpowered; return 0; } diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c index 2af45a0c8930..10d30afe4a3c 100644 --- a/drivers/usb/musb/musb_gadget_ep0.c +++ b/drivers/usb/musb/musb_gadget_ep0.c @@ -85,7 +85,7 @@ static int service_tx_status_request( switch (recip) { case USB_RECIP_DEVICE: - result[0] = musb->is_self_powered << USB_DEVICE_SELF_POWERED; + result[0] = musb->g.is_selfpowered << USB_DEVICE_SELF_POWERED; result[0] |= musb->may_wakeup << USB_DEVICE_REMOTE_WAKEUP; if (musb->g.is_otg) { result[0] |= musb->g.b_hnp_enable |