.. | .. |
---|
3 | 3 | * Renesas USB driver |
---|
4 | 4 | * |
---|
5 | 5 | * Copyright (C) 2011 Renesas Solutions Corp. |
---|
| 6 | + * Copyright (C) 2019 Renesas Electronics Corporation |
---|
6 | 7 | * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
---|
7 | 8 | */ |
---|
8 | 9 | #include <linux/delay.h> |
---|
.. | .. |
---|
264 | 265 | case USB_DEVICE_TEST_MODE: |
---|
265 | 266 | usbhsg_recip_handler_std_control_done(priv, uep, ctrl); |
---|
266 | 267 | udelay(100); |
---|
267 | | - usbhs_sys_set_test_mode(priv, le16_to_cpu(ctrl->wIndex >> 8)); |
---|
| 268 | + usbhs_sys_set_test_mode(priv, le16_to_cpu(ctrl->wIndex) >> 8); |
---|
268 | 269 | break; |
---|
269 | 270 | default: |
---|
270 | 271 | usbhsg_recip_handler_std_control_done(priv, uep, ctrl); |
---|
.. | .. |
---|
314 | 315 | struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(dcp); |
---|
315 | 316 | struct device *dev = usbhsg_gpriv_to_dev(gpriv); |
---|
316 | 317 | struct usb_request *req; |
---|
317 | | - unsigned short *buf; |
---|
| 318 | + __le16 *buf; |
---|
318 | 319 | |
---|
319 | 320 | /* alloc new usb_request for recip */ |
---|
320 | 321 | req = usb_ep_alloc_request(&dcp->ep, GFP_ATOMIC); |
---|
.. | .. |
---|
508 | 509 | case READ_STATUS_STAGE: |
---|
509 | 510 | case WRITE_STATUS_STAGE: |
---|
510 | 511 | usbhs_dcp_control_transfer_done(pipe); |
---|
511 | | - /* fall through */ |
---|
| 512 | + fallthrough; |
---|
512 | 513 | default: |
---|
513 | 514 | return ret; |
---|
514 | 515 | } |
---|
.. | .. |
---|
932 | 933 | { |
---|
933 | 934 | struct usbhs_mod_info *info = &priv->mod_info; |
---|
934 | 935 | |
---|
935 | | - info->irq_vbus = NULL; |
---|
936 | | - priv->pfunc.get_vbus = usbhsm_phy_get_vbus; |
---|
| 936 | + info->irq_vbus = NULL; |
---|
| 937 | + info->get_vbus = usbhsm_phy_get_vbus; |
---|
937 | 938 | |
---|
938 | 939 | usbhs_irq_callback_update(priv, NULL); |
---|
939 | 940 | } |
---|
.. | .. |
---|
1041 | 1042 | |
---|
1042 | 1043 | gpriv->vbus_active = !!is_active; |
---|
1043 | 1044 | |
---|
1044 | | - renesas_usbhs_call_notify_hotplug(pdev); |
---|
| 1045 | + usbhsc_schedule_notify_hotplug(pdev); |
---|
1045 | 1046 | |
---|
1046 | 1047 | return 0; |
---|
1047 | 1048 | } |
---|