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

Pull USB updates from Greg KH:
 "Here's the big USB patchset for 3.18-rc1.  Also in here is the PHY
  tree, as it seems to fit well with the USB tree for various reasons...

  Anyway, lots of little changes in here, all over the place, full
  details in the changelog

  All have been in the linux-next tree for a while with no issues"

* tag 'usb-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (244 commits)
  USB: host: st: fix typo 'CONFIG_USB_EHCI_HCD_ST'
  uas: Reduce number of function arguments for uas_alloc_foo functions
  xhci: Allow xHCI drivers to be built as separate modules
  xhci: Export symbols used by host-controller drivers
  xhci: Check for XHCI_COMP_MODE_QUIRK when disabling D3cold
  xhci: Introduce xhci_init_driver()
  usb: hcd: add generic PHY support
  usb: rename phy to usb_phy in HCD
  usb: gadget: uvc: fix up uvcg_v4l2_get_unmapped_area typo
  USB: host: st: fix ehci/ohci driver selection
  usb: host: ehci-exynos: Remove unnecessary usb-phy support
  usb: core: return -ENOTSUPP for all targeted hosts
  USB: Remove .owner field for driver
  usb: core: log higher level message on malformed LANGID descriptor
  usb: Add LED triggers for USB activity
  usb: Rename usb-common.c
  usb: gadget: Refactor request completion
  usb: gadget: Introduce usb_gadget_giveback_request()
  usb: dwc2/gadget: move phy bus legth initialization
  phy: remove .owner field for drivers using module_platform_driver
  ...

1 files changed, 28 insertions, 21 deletions

diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c
index ab1065afbbd0..6da4685490ef 100644
--- a/drivers/usb/gadget/function/f_acm.c
+++ b/drivers/usb/gadget/function/f_acm.c
@@ -313,15 +313,15 @@ static void acm_complete_set_line_coding(struct usb_ep *ep,
         struct usb_composite_dev *cdev = acm->port.func.config->cdev;
 
         if (req->status != 0) {
-                DBG(cdev, "acm ttyGS%d completion, err %d\n",
-                                acm->port_num, req->status);
+                dev_dbg(&cdev->gadget->dev, "acm ttyGS%d completion, err %d\n",
+                        acm->port_num, req->status);
                 return;
         }
 
         /* normal completion */
         if (req->actual != sizeof(acm->port_line_coding)) {
-                DBG(cdev, "acm ttyGS%d short resp, len %d\n",
-                                acm->port_num, req->actual);
+                dev_dbg(&cdev->gadget->dev, "acm ttyGS%d short resp, len %d\n",
+                        acm->port_num, req->actual);
                 usb_ep_set_halt(ep);
         } else {
                 struct usb_cdc_line_coding      *value = req->buf;
@@ -397,14 +397,16 @@ static int acm_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
 
         default:
 invalid:
-                VDBG(cdev, "invalid control req%02x.%02x v%04x i%04x l%d\n",
-                        ctrl->bRequestType, ctrl->bRequest,
-                        w_value, w_index, w_length);
+                dev_vdbg(&cdev->gadget->dev,
+                         "invalid control req%02x.%02x v%04x i%04x l%d\n",
+                         ctrl->bRequestType, ctrl->bRequest,
+                         w_value, w_index, w_length);
         }
 
         /* respond with data transfer or status phase? */
         if (value >= 0) {
-                DBG(cdev, "acm ttyGS%d req%02x.%02x v%04x i%04x l%d\n",
+                dev_dbg(&cdev->gadget->dev,
+                        "acm ttyGS%d req%02x.%02x v%04x i%04x l%d\n",
                         acm->port_num, ctrl->bRequestType, ctrl->bRequest,
                         w_value, w_index, w_length);
                 req->zero = 0;
@@ -428,10 +430,12 @@ static int acm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 
         if (intf == acm->ctrl_id) {
                 if (acm->notify->driver_data) {
-                        VDBG(cdev, "reset acm control interface %d\n", intf);
+                        dev_vdbg(&cdev->gadget->dev,
+                                 "reset acm control interface %d\n", intf);
                         usb_ep_disable(acm->notify);
                 } else {
-                        VDBG(cdev, "init acm ctrl interface %d\n", intf);
+                        dev_vdbg(&cdev->gadget->dev,
+                                 "init acm ctrl interface %d\n", intf);
                         if (config_ep_by_speed(cdev->gadget, f, acm->notify))
                                 return -EINVAL;
                 }
@@ -440,11 +444,13 @@ static int acm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 
         } else if (intf == acm->data_id) {
                 if (acm->port.in->driver_data) {
-                        DBG(cdev, "reset acm ttyGS%d\n", acm->port_num);
+                        dev_dbg(&cdev->gadget->dev,
+                                "reset acm ttyGS%d\n", acm->port_num);
                         gserial_disconnect(&acm->port);
                 }
                 if (!acm->port.in->desc || !acm->port.out->desc) {
-                        DBG(cdev, "activate acm ttyGS%d\n", acm->port_num);
+                        dev_dbg(&cdev->gadget->dev,
+                                "activate acm ttyGS%d\n", acm->port_num);
                         if (config_ep_by_speed(cdev->gadget, f,
                                                acm->port.in) ||
                             config_ep_by_speed(cdev->gadget, f,
@@ -467,7 +473,7 @@ static void acm_disable(struct usb_function *f)
         struct f_acm    *acm = func_to_acm(f);
         struct usb_composite_dev *cdev = f->config->cdev;
 
-        DBG(cdev, "acm ttyGS%d deactivated\n", acm->port_num);
+        dev_dbg(&cdev->gadget->dev, "acm ttyGS%d deactivated\n", acm->port_num);
         gserial_disconnect(&acm->port);
         usb_ep_disable(acm->notify);
         acm->notify->driver_data = NULL;
@@ -537,8 +543,8 @@ static int acm_notify_serial_state(struct f_acm *acm)
 
         spin_lock(&acm->lock);
         if (acm->notify_req) {
-                DBG(cdev, "acm ttyGS%d serial state %04x\n",
-                                acm->port_num, acm->serial_state);
+                dev_dbg(&cdev->gadget->dev, "acm ttyGS%d serial state %04x\n",
+                        acm->port_num, acm->serial_state);
                 status = acm_cdc_notify(acm, USB_CDC_NOTIFY_SERIAL_STATE,
                                 0, &acm->serial_state, sizeof(acm->serial_state));
         } else {
@@ -691,12 +697,13 @@ acm_bind(struct usb_configuration *c, struct usb_function *f)
         if (status)
                 goto fail;
 
-        DBG(cdev, "acm ttyGS%d: %s speed IN/%s OUT/%s NOTIFY/%s\n",
-                        acm->port_num,
-                        gadget_is_superspeed(c->cdev->gadget) ? "super" :
-                        gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
-                        acm->port.in->name, acm->port.out->name,
-                        acm->notify->name);
+        dev_dbg(&cdev->gadget->dev,
+                "acm ttyGS%d: %s speed IN/%s OUT/%s NOTIFY/%s\n",
+                acm->port_num,
+                gadget_is_superspeed(c->cdev->gadget) ? "super" :
+                gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
+                acm->port.in->name, acm->port.out->name,
+                acm->notify->name);
         return 0;
 
 fail: