diff options
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/dummy_hcd.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/ether.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/file_storage.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/lh7a40x_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index 42036192a03c..b36ad240534c 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c | |||
@@ -1865,7 +1865,7 @@ static int dummy_hcd_probe(struct platform_device *pdev) | |||
1865 | 1865 | ||
1866 | dev_info(&pdev->dev, "%s, driver " DRIVER_VERSION "\n", driver_desc); | 1866 | dev_info(&pdev->dev, "%s, driver " DRIVER_VERSION "\n", driver_desc); |
1867 | 1867 | ||
1868 | hcd = usb_create_hcd(&dummy_hcd, &pdev->dev, pdev->dev.bus_id); | 1868 | hcd = usb_create_hcd(&dummy_hcd, &pdev->dev, dev_name(&pdev->dev)); |
1869 | if (!hcd) | 1869 | if (!hcd) |
1870 | return -ENOMEM; | 1870 | return -ENOMEM; |
1871 | the_controller = hcd_to_dummy (hcd); | 1871 | the_controller = hcd_to_dummy (hcd); |
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 4ce3950b997f..d3891b2fc36e 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c | |||
@@ -1642,7 +1642,7 @@ static void eth_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *p) | |||
1642 | strlcpy(p->driver, shortname, sizeof p->driver); | 1642 | strlcpy(p->driver, shortname, sizeof p->driver); |
1643 | strlcpy(p->version, DRIVER_VERSION, sizeof p->version); | 1643 | strlcpy(p->version, DRIVER_VERSION, sizeof p->version); |
1644 | strlcpy(p->fw_version, dev->gadget->name, sizeof p->fw_version); | 1644 | strlcpy(p->fw_version, dev->gadget->name, sizeof p->fw_version); |
1645 | strlcpy (p->bus_info, dev->gadget->dev.bus_id, sizeof p->bus_info); | 1645 | strlcpy (p->bus_info, dev_name(&dev->gadget->dev), sizeof p->bus_info); |
1646 | } | 1646 | } |
1647 | 1647 | ||
1648 | static u32 eth_get_link(struct net_device *net) | 1648 | static u32 eth_get_link(struct net_device *net) |
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c index 47bb9f09a1aa..638cee03a24e 100644 --- a/drivers/usb/gadget/file_storage.c +++ b/drivers/usb/gadget/file_storage.c | |||
@@ -3868,7 +3868,7 @@ static int __init fsg_bind(struct usb_gadget *gadget) | |||
3868 | curlun->dev.driver = &fsg_driver.driver; | 3868 | curlun->dev.driver = &fsg_driver.driver; |
3869 | dev_set_drvdata(&curlun->dev, fsg); | 3869 | dev_set_drvdata(&curlun->dev, fsg); |
3870 | snprintf(curlun->dev.bus_id, BUS_ID_SIZE, | 3870 | snprintf(curlun->dev.bus_id, BUS_ID_SIZE, |
3871 | "%s-lun%d", gadget->dev.bus_id, i); | 3871 | "%s-lun%d", dev_name(&gadget->dev), i); |
3872 | 3872 | ||
3873 | if ((rc = device_register(&curlun->dev)) != 0) { | 3873 | if ((rc = device_register(&curlun->dev)) != 0) { |
3874 | INFO(fsg, "failed to register LUN%d: %d\n", i, rc); | 3874 | INFO(fsg, "failed to register LUN%d: %d\n", i, rc); |
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c index 825abd2621b3..c6e7df04c69a 100644 --- a/drivers/usb/gadget/lh7a40x_udc.c +++ b/drivers/usb/gadget/lh7a40x_udc.c | |||
@@ -1970,7 +1970,7 @@ static const struct usb_gadget_ops lh7a40x_udc_ops = { | |||
1970 | 1970 | ||
1971 | static void nop_release(struct device *dev) | 1971 | static void nop_release(struct device *dev) |
1972 | { | 1972 | { |
1973 | DEBUG("%s %s\n", __func__, dev->bus_id); | 1973 | DEBUG("%s %s\n", __func__, dev_name(dev)); |
1974 | } | 1974 | } |
1975 | 1975 | ||
1976 | static struct lh7a40x_udc memory = { | 1976 | static struct lh7a40x_udc memory = { |
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 031dceb93023..fbd6289977c8 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c | |||
@@ -1818,7 +1818,7 @@ pxa25x_udc_irq(int irq, void *_dev) | |||
1818 | 1818 | ||
1819 | static void nop_release (struct device *dev) | 1819 | static void nop_release (struct device *dev) |
1820 | { | 1820 | { |
1821 | DMSG("%s %s\n", __func__, dev->bus_id); | 1821 | DMSG("%s %s\n", __func__, dev_name(dev)); |
1822 | } | 1822 | } |
1823 | 1823 | ||
1824 | /* this uses load-time allocation and initialization (instead of | 1824 | /* this uses load-time allocation and initialization (instead of |