diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:23 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:23 -0400 |
commit | 5df5852446196c9713e897ab5f9b8a168d971a00 (patch) | |
tree | daf1155f31ad925034e1929c99f7e846b2903aaf /drivers/usb/gadget | |
parent | 2c0f3e96f3fc7bbd1cb3caa601f19cf030c2b958 (diff) |
usb: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/ci13xxx_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/imx_udc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c index bebf911c7e5f..7f4e5eb1dc80 100644 --- a/drivers/usb/gadget/ci13xxx_udc.c +++ b/drivers/usb/gadget/ci13xxx_udc.c | |||
@@ -2626,7 +2626,7 @@ static int udc_probe(struct device *dev, void __iomem *regs, const char *name) | |||
2626 | INIT_LIST_HEAD(&udc->gadget.ep_list); | 2626 | INIT_LIST_HEAD(&udc->gadget.ep_list); |
2627 | udc->gadget.ep0 = NULL; | 2627 | udc->gadget.ep0 = NULL; |
2628 | 2628 | ||
2629 | strcpy(udc->gadget.dev.bus_id, "gadget"); | 2629 | dev_set_name(&udc->gadget.dev, "gadget"); |
2630 | udc->gadget.dev.dma_mask = dev->dma_mask; | 2630 | udc->gadget.dev.dma_mask = dev->dma_mask; |
2631 | udc->gadget.dev.parent = dev; | 2631 | udc->gadget.dev.parent = dev; |
2632 | udc->gadget.dev.release = udc_release; | 2632 | udc->gadget.dev.release = udc_release; |
diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c index 77c5d0a8a06e..cd67ac75e624 100644 --- a/drivers/usb/gadget/imx_udc.c +++ b/drivers/usb/gadget/imx_udc.c | |||
@@ -1186,8 +1186,8 @@ static struct imx_udc_struct controller = { | |||
1186 | .ep0 = &controller.imx_ep[0].ep, | 1186 | .ep0 = &controller.imx_ep[0].ep, |
1187 | .name = driver_name, | 1187 | .name = driver_name, |
1188 | .dev = { | 1188 | .dev = { |
1189 | .bus_id = "gadget", | 1189 | .init_name = "gadget", |
1190 | }, | 1190 | }, |
1191 | }, | 1191 | }, |
1192 | 1192 | ||
1193 | .imx_ep[0] = { | 1193 | .imx_ep[0] = { |