diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:05 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-09 10:55:05 +0100 |
| commit | 227426f16163d3721fee82650980aae0eef01375 (patch) | |
| tree | a64101906c15b814ec942468e88875ce8160e45d /drivers/usb | |
| parent | c024f90f5dd5604d3f82dbbc055fd88a69d59187 (diff) | |
| parent | ac7324a0ed12a67fc836b383388f2562d32e55ed (diff) | |
| download | barebox-227426f16163d3721fee82650980aae0eef01375.tar.gz barebox-227426f16163d3721fee82650980aae0eef01375.tar.xz | |
Merge branch 'for-next/net-switch-mv88e6xxx'
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/core/usb.c | 5 | ||||
| -rw-r--r-- | drivers/usb/gadget/udc-core.c | 4 | ||||
| -rw-r--r-- | drivers/usb/musb/musb_dsps.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 70ded6ded1..0ee8808a6b 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -431,9 +431,10 @@ int usb_new_device(struct usb_device *dev) dev->serial, sizeof(dev->serial)); if (parent) { - sprintf(dev->dev.name, "%s-%d", parent->dev.name, dev->portnr - 1); + dev_set_name(&dev->dev, "%s-%d", parent->dev.name, + dev->portnr - 1); } else { - sprintf(dev->dev.name, "usb%d", dev->host->busnum); + dev_set_name(&dev->dev, "usb%d", dev->host->busnum); } dev->dev.id = DEVICE_ID_SINGLE; diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c index ed99b53df7..e357456098 100644 --- a/drivers/usb/gadget/udc-core.c +++ b/drivers/usb/gadget/udc-core.c @@ -179,7 +179,7 @@ int usb_add_gadget_udc_release(struct device_d *parent, struct usb_gadget *gadge if (!udc) goto err1; - strcpy(gadget->dev.name, "usbgadget"); + dev_set_name(&gadget->dev, "usbgadget"); gadget->dev.id = DEVICE_ID_SINGLE; gadget->dev.parent = parent; @@ -198,7 +198,7 @@ int usb_add_gadget_udc_release(struct device_d *parent, struct usb_gadget *gadge dev_add_param_string(&gadget->dev, "productname", NULL, NULL, &gadget->productname, NULL); - strcpy(udc->dev.name, "udc"); + dev_set_name(&udc->dev, "udc"); udc->dev.id = DEVICE_ID_DYNAMIC; udc->gadget = gadget; diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c index 431b97ea9b..5fe3bcb7cd 100644 --- a/drivers/usb/musb/musb_dsps.c +++ b/drivers/usb/musb/musb_dsps.c @@ -333,7 +333,7 @@ static int dsps_register_otg_device(struct dsps_glue *glue) { int ret; - strcpy(glue->otg_dev.name, "otg"); + dev_set_name(&glue->otg_dev, "otg"); glue->otg_dev.id = DEVICE_ID_DYNAMIC, glue->otg_dev.parent = glue->dev; |