diff options
author | Peter Chen <peter.chen@freescale.com> | 2015-01-28 03:32:41 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2015-01-29 11:35:43 -0500 |
commit | dadac9861f466635c3ac0851f2a39be68fa10a71 (patch) | |
tree | 0ac4f329d7c25b75dc20da8a504774a51ebee1be | |
parent | bcdea50312b291ee3920bad43a13e42d7102f900 (diff) |
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: | |||
1612 | static int | 1612 | static int |
1613 | musb_gadget_set_self_powered(struct usb_gadget *gadget, int is_selfpowered) | 1613 | musb_gadget_set_self_powered(struct usb_gadget *gadget, int is_selfpowered) |
1614 | { | 1614 | { |
1615 | struct musb *musb = gadget_to_musb(gadget); | 1615 | gadget->is_selfpowered = !!is_selfpowered; |
1616 | |||
1617 | musb->is_self_powered = !!is_selfpowered; | ||
1618 | return 0; | 1616 | return 0; |
1619 | } | 1617 | } |
1620 | 1618 | ||
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( | |||
85 | 85 | ||
86 | switch (recip) { | 86 | switch (recip) { |
87 | case USB_RECIP_DEVICE: | 87 | case USB_RECIP_DEVICE: |
88 | result[0] = musb->is_self_powered << USB_DEVICE_SELF_POWERED; | 88 | result[0] = musb->g.is_selfpowered << USB_DEVICE_SELF_POWERED; |
89 | result[0] |= musb->may_wakeup << USB_DEVICE_REMOTE_WAKEUP; | 89 | result[0] |= musb->may_wakeup << USB_DEVICE_REMOTE_WAKEUP; |
90 | if (musb->g.is_otg) { | 90 | if (musb->g.is_otg) { |
91 | result[0] |= musb->g.b_hnp_enable | 91 | result[0] |= musb->g.b_hnp_enable |