Commit af1969a2 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: gadget: Rename usb_gadget_probe_driver() 



In preparation for adding a "gadget" bus, this patch renames
usb_gadget_probe_driver() to usb_gadget_register_driver().  The new
name will be more accurate, since gadget drivers will be registered on
the gadget bus and the probing will be done by the driver core, not
the UDC core.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/YmSc29YZvxgT5fEJ@rowland.harvard.edu


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 08908fa1

drivers/usb/gadget/composite.c

+1 −1
Original line number Diff line number Diff line
@@ -2505,7 +2505,7 @@ int usb_composite_probe(struct usb_composite_driver *driver) 
	gadget_driver->driver.name = driver->name;

	gadget_driver->max_speed = driver->max_speed;



	return usb_gadget_probe_driver(gadget_driver);

	return usb_gadget_register_driver(gadget_driver);

}

EXPORT_SYMBOL_GPL(usb_composite_probe);

drivers/usb/gadget/configfs.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static ssize_t gadget_dev_desc_UDC_store(struct config_item *item, 
			goto err;

		}

		gi->composite.gadget_driver.udc_name = name;

		ret = usb_gadget_probe_driver(&gi->composite.gadget_driver);

		ret = usb_gadget_register_driver(&gi->composite.gadget_driver);

		if (ret) {

			gi->composite.gadget_driver.udc_name = NULL;

			goto err;

drivers/usb/gadget/legacy/dbgp.c

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static struct usb_gadget_driver dbgp_driver = { 


static int __init dbgp_init(void)

{

	return usb_gadget_probe_driver(&dbgp_driver);

	return usb_gadget_register_driver(&dbgp_driver);

}



static void __exit dbgp_exit(void)

drivers/usb/gadget/legacy/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1873,7 +1873,7 @@ dev_config (struct file *fd, const char __user *buf, size_t len, loff_t *ptr) 
	else

		gadgetfs_driver.max_speed = USB_SPEED_FULL;



	value = usb_gadget_probe_driver(&gadgetfs_driver);

	value = usb_gadget_register_driver(&gadgetfs_driver);

	if (value != 0) {

		spin_lock_irq(&dev->lock);

		goto fail;

drivers/usb/gadget/legacy/raw_gadget.c

+2 −2
Original line number Diff line number Diff line
@@ -510,12 +510,12 @@ static int raw_ioctl_run(struct raw_dev *dev, unsigned long value) 
	}

	spin_unlock_irqrestore(&dev->lock, flags);



	ret = usb_gadget_probe_driver(&dev->driver);

	ret = usb_gadget_register_driver(&dev->driver);



	spin_lock_irqsave(&dev->lock, flags);

	if (ret) {

		dev_err(dev->dev,

			"fail, usb_gadget_probe_driver returned %d\n", ret);

			"fail, usb_gadget_register_driver returned %d\n", ret);

		dev->state = STATE_DEV_FAILED;

		goto out_unlock;

	}