Browse Source

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>
Kay Sievers 16 years ago
parent
commit
5df5852446
2 changed files with 3 additions and 3 deletions
  1. 1 1
      drivers/usb/gadget/ci13xxx_udc.c
  2. 2 2
      drivers/usb/gadget/imx_udc.c

+ 1 - 1
drivers/usb/gadget/ci13xxx_udc.c

@@ -2626,7 +2626,7 @@ static int udc_probe(struct device *dev, void __iomem *regs, const char *name)
 	INIT_LIST_HEAD(&udc->gadget.ep_list);
 	INIT_LIST_HEAD(&udc->gadget.ep_list);
 	udc->gadget.ep0 = NULL;
 	udc->gadget.ep0 = NULL;
 
 
-	strcpy(udc->gadget.dev.bus_id, "gadget");
+	dev_set_name(&udc->gadget.dev, "gadget");
 	udc->gadget.dev.dma_mask = dev->dma_mask;
 	udc->gadget.dev.dma_mask = dev->dma_mask;
 	udc->gadget.dev.parent   = dev;
 	udc->gadget.dev.parent   = dev;
 	udc->gadget.dev.release  = udc_release;
 	udc->gadget.dev.release  = udc_release;

+ 2 - 2
drivers/usb/gadget/imx_udc.c

@@ -1186,8 +1186,8 @@ static struct imx_udc_struct controller = {
 		.ep0		= &controller.imx_ep[0].ep,
 		.ep0		= &controller.imx_ep[0].ep,
 		.name		= driver_name,
 		.name		= driver_name,
 		.dev = {
 		.dev = {
-			 .bus_id	= "gadget",
-		 },
+			.init_name	= "gadget",
+		},
 	},
 	},
 
 
 	.imx_ep[0] = {
 	.imx_ep[0] = {