Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 427c4f33 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

usb: struct device - replace bus_id with dev_name(), dev_set_name() 



Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 796bcae7

drivers/usb/host/ohci-tmio.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int __devinit ohci_hcd_tmio_drv_probe(struct platform_device *dev) 
	if (!cell)

		return -EINVAL;



	hcd = usb_create_hcd(&ohci_tmio_hc_driver, &dev->dev, dev->dev.bus_id);

	hcd = usb_create_hcd(&ohci_tmio_hc_driver, &dev->dev, dev_name(&dev->dev));

	if (!hcd) {

		ret = -ENOMEM;

		goto err_usb_create_hcd;

drivers/usb/musb/musb_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1781,7 +1781,7 @@ allocate_instance(struct device *dev, 
#ifdef CONFIG_USB_MUSB_HDRC_HCD

	struct usb_hcd	*hcd;



	hcd = usb_create_hcd(&musb_hc_driver, dev, dev->bus_id);

	hcd = usb_create_hcd(&musb_hc_driver, dev, dev_name(dev));

	if (!hcd)

		return NULL;

	/* usbcore sets dev->driver_data to hcd, and sometimes uses that... */
@@ -1984,7 +1984,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 
	INIT_WORK(&musb->irq_work, musb_irq_work);



	/* attach to the IRQ */

	if (request_irq(nIrq, musb->isr, 0, dev->bus_id, musb)) {

	if (request_irq(nIrq, musb->isr, 0, dev_name(dev), musb)) {

		dev_err(dev, "request_irq %d failed!\n", nIrq);

		status = -ENODEV;

		goto fail2;

drivers/usb/musb/musb_gadget.c

+1 −1
Original line number Diff line number Diff line
@@ -1633,7 +1633,7 @@ int __init musb_gadget_setup(struct musb *musb) 
	musb->g.speed = USB_SPEED_UNKNOWN;



	/* this "gadget" abstracts/virtualizes the controller */

	strcpy(musb->g.dev.bus_id, "gadget");

	dev_set_name(&musb->g.dev, "gadget");

	musb->g.dev.parent = musb->controller;

	musb->g.dev.dma_mask = musb->controller->dma_mask;

	musb->g.dev.release = musb_gadget_release;

drivers/usb/musb/musbhsdma.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ dma_controller_create(struct musb *musb, void __iomem *base) 
	controller->controller.channel_abort = dma_channel_abort;



	if (request_irq(irq, dma_controller_irq, IRQF_DISABLED,

			musb->controller->bus_id, &controller->controller)) {

			dev_name(musb->controller), &controller->controller)) {

		dev_err(dev, "request_irq %d failed!\n", irq);

		dma_controller_destroy(&controller->controller);