forked from Minki/linux
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: Alan Stern <stern@rowland.harvard.edu> Link: https://lore.kernel.org/r/YmSc29YZvxgT5fEJ@rowland.harvard.edu Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
08908fa154
commit
af1969a2d7
@ -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);
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -1523,7 +1523,7 @@ err1:
|
||||
return ret;
|
||||
}
|
||||
|
||||
int usb_gadget_probe_driver(struct usb_gadget_driver *driver)
|
||||
int usb_gadget_register_driver(struct usb_gadget_driver *driver)
|
||||
{
|
||||
struct usb_udc *udc = NULL, *iter;
|
||||
int ret = -ENODEV;
|
||||
@ -1572,7 +1572,7 @@ found:
|
||||
mutex_unlock(&udc_lock);
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(usb_gadget_probe_driver);
|
||||
EXPORT_SYMBOL_GPL(usb_gadget_register_driver);
|
||||
|
||||
int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
|
||||
{
|
||||
|
@ -745,7 +745,7 @@ struct usb_gadget_driver {
|
||||
*/
|
||||
|
||||
/**
|
||||
* usb_gadget_probe_driver - probe a gadget driver
|
||||
* usb_gadget_register_driver - register a gadget driver
|
||||
* @driver: the driver being registered
|
||||
* Context: can sleep
|
||||
*
|
||||
@ -755,7 +755,7 @@ struct usb_gadget_driver {
|
||||
* registration call returns. It's expected that the @bind() function will
|
||||
* be in init sections.
|
||||
*/
|
||||
int usb_gadget_probe_driver(struct usb_gadget_driver *driver);
|
||||
int usb_gadget_register_driver(struct usb_gadget_driver *driver);
|
||||
|
||||
/**
|
||||
* usb_gadget_unregister_driver - unregister a gadget driver
|
||||
|
Loading…
Reference in New Issue
Block a user