aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/renesas_usbhs
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-22 16:16:06 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-22 16:16:06 -0400
commit34a0036748257dd97b22b76ef64aa44559f2ef6f (patch)
tree48384dca01f8fd8bbf566ca0df07e80b18d32fec /drivers/usb/renesas_usbhs
parenta85c0f8db3329ab433dab49322616e6985317cd7 (diff)
parent0852659ef071ccd84e85e37195e7c2f3e7c64d1f (diff)
Merge tag 'usb-for-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes: usb: changes for v4.14 merge window Not a big pull request this time around. Only 49 non-merge commits. This pull request is, however, all over the place. Most of the changes are in the bdc driver adding support for USB Phy layer and PM. Renesas adds support for R-Car H3 ES2.0 and R-Car M3-W SoCs. Also here is PM_RUNTIME support for dwc3-keystone. UDC Core got a DMA unmap fix to make sure we only unmap requests that were, indeed, mapped. Other than these, we have a lot of cleanups, many of them adding 'const' to several places.
Diffstat (limited to 'drivers/usb/renesas_usbhs')
-rw-r--r--drivers/usb/renesas_usbhs/mod_gadget.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 2c8161bcf5b5..c068b673420b 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -764,7 +764,7 @@ static int usbhsg_ep_set_wedge(struct usb_ep *ep)
764 return __usbhsg_ep_set_halt_wedge(ep, 1, 1); 764 return __usbhsg_ep_set_halt_wedge(ep, 1, 1);
765} 765}
766 766
767static struct usb_ep_ops usbhsg_ep_ops = { 767static const struct usb_ep_ops usbhsg_ep_ops = {
768 .enable = usbhsg_ep_enable, 768 .enable = usbhsg_ep_enable,
769 .disable = usbhsg_ep_disable, 769 .disable = usbhsg_ep_disable,
770 770
@@ -1082,7 +1082,6 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
1082 ret = -ENOMEM; 1082 ret = -ENOMEM;
1083 goto usbhs_mod_gadget_probe_err_gpriv; 1083 goto usbhs_mod_gadget_probe_err_gpriv;
1084 } 1084 }
1085 spin_lock_init(&uep->lock);
1086 1085
1087 gpriv->transceiver = usb_get_phy(USB_PHY_TYPE_UNDEFINED); 1086 gpriv->transceiver = usb_get_phy(USB_PHY_TYPE_UNDEFINED);
1088 dev_info(dev, "%stransceiver found\n", 1087 dev_info(dev, "%stransceiver found\n",
@@ -1132,6 +1131,7 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
1132 uep->ep.name = uep->ep_name; 1131 uep->ep.name = uep->ep_name;
1133 uep->ep.ops = &usbhsg_ep_ops; 1132 uep->ep.ops = &usbhsg_ep_ops;
1134 INIT_LIST_HEAD(&uep->ep.ep_list); 1133 INIT_LIST_HEAD(&uep->ep.ep_list);
1134 spin_lock_init(&uep->lock);
1135 1135
1136 /* init DCP */ 1136 /* init DCP */
1137 if (usbhsg_is_dcp(uep)) { 1137 if (usbhsg_is_dcp(uep)) {