Merge tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB/PHY updates from Greg KH:
 "Here is the big set of USB and PHY driver updates for 4.15-rc1.

  There is the usual amount of gadget and xhci driver updates, along
  with phy and chipidea enhancements. There's also a lot of SPDX tags
  and license boilerplate cleanups as well, which provide some churn in
  the diffstat.

  Other major thing is the typec code that moved out of staging and into
  the "real" part of the drivers/usb/ tree, which was nice to see
  happen.

  All of these have been in linux-next with no reported issues for a
  while"

* tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (263 commits)
  usb: gadget: f_fs: Fix use-after-free in ffs_free_inst
  USB: usbfs: compute urb->actual_length for isochronous
  usb: core: message: remember to reset 'ret' to 0 when necessary
  USB: typec: Remove remaining redundant license text
  USB: typec: add SPDX identifiers to some files
  USB: renesas_usbhs: rcar?.h: add SPDX tags
  USB: chipidea: ci_hdrc_tegra.c: add SPDX line
  USB: host: xhci-debugfs: add SPDX lines
  USB: add SPDX identifiers to all remaining Makefiles
  usb: host: isp1362-hcd: remove a couple of redundant assignments
  USB: adutux: remove redundant variable minor
  usb: core: add a new usb_get_ptm_status() helper
  usb: core: add a 'type' parameter to usb_get_status()
  usb: core: introduce a new usb_get_std_status() helper
  usb: core: rename usb_get_status() 'type' argument to 'recip'
  usb: core: add Status Type definitions
  USB: gadget: Remove redundant license text
  USB: gadget: function: Remove redundant license text
  USB: gadget: udc: Remove redundant license text
  USB: gadget: legacy: Remove redundant license text
  ...

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 5ad74750e8a4..aedc9a7f149e 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -1023,7 +1024,7 @@ static int ch9_postconfig(struct usbtest_dev *dev)
         /* FIXME fetch strings from at least the device descriptor */
 
         /* [9.4.5] get_status always works */
-        retval = usb_get_status(udev, USB_RECIP_DEVICE, 0, dev->buf);
+        retval = usb_get_std_status(udev, USB_RECIP_DEVICE, 0, dev->buf);
         if (retval) {
                 dev_err(&iface->dev, "get dev status --> %d\n", retval);
                 return retval;
@@ -1033,7 +1034,7 @@ static int ch9_postconfig(struct usbtest_dev *dev)
          * the device's remote wakeup feature ... if we can, test that here
          */
 
-        retval = usb_get_status(udev, USB_RECIP_INTERFACE,
+        retval = usb_get_std_status(udev, USB_RECIP_INTERFACE,
                         iface->altsetting[0].desc.bInterfaceNumber, dev->buf);
         if (retval) {
                 dev_err(&iface->dev, "get interface status --> %d\n", retval);
@@ -1622,7 +1623,7 @@ static int verify_not_halted(struct usbtest_dev *tdev, int ep, struct urb *urb)
         u16     status;
 
         /* shouldn't look or act halted */
-        retval = usb_get_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status);
+        retval = usb_get_std_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status);
         if (retval < 0) {
                 ERROR(tdev, "ep %02x couldn't get no-halt status, %d\n",
                                 ep, retval);
@@ -1644,7 +1645,7 @@ static int verify_halted(struct usbtest_dev *tdev, int ep, struct urb *urb)
         u16     status;
 
         /* should look and act halted */
-        retval = usb_get_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status);
+        retval = usb_get_std_status(urb->dev, USB_RECIP_ENDPOINT, ep, &status);
         if (retval < 0) {
                 ERROR(tdev, "ep %02x couldn't get halt status, %d\n",
                                 ep, retval);
@@ -1917,7 +1918,7 @@ static struct urb *iso_alloc_urb(
 
         if (bytes < 0 || !desc)
                 return NULL;
-        maxp = 0x7ff & usb_endpoint_maxp(desc);
+        maxp = usb_endpoint_maxp(desc);
         maxp *= usb_endpoint_maxp_mult(desc);
         packets = DIV_ROUND_UP(bytes, maxp);