diff options
author | Felipe Balbi <balbi@ti.com> | 2014-10-17 19:57:06 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-11-03 11:01:16 -0500 |
commit | 02e8c966274f1049cca8d3f17092f8275979b8eb (patch) | |
tree | ec469bf51aa13fe6a571e34bab3765a1f310ea76 | |
parent | 22835b807e7ca946a4d1fbd4c7af56aa09cd273e (diff) |
usb: gadget: udc: core: prepend udc_attach_driver with usb_
No functional changes, just adding a prefix
which should have been there from the start.
Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r-- | drivers/usb/gadget/configfs.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/udc/udc-core.c | 4 | ||||
-rw-r--r-- | include/linux/usb/gadget.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c index d25f9f3dfea0..75648145dc1b 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c | |||
@@ -271,7 +271,7 @@ static ssize_t gadget_dev_desc_UDC_store(struct gadget_info *gi, | |||
271 | ret = -EBUSY; | 271 | ret = -EBUSY; |
272 | goto err; | 272 | goto err; |
273 | } | 273 | } |
274 | ret = udc_attach_driver(name, &gi->composite.gadget_driver); | 274 | ret = usb_udc_attach_driver(name, &gi->composite.gadget_driver); |
275 | if (ret) | 275 | if (ret) |
276 | goto err; | 276 | goto err; |
277 | gi->udc_name = name; | 277 | gi->udc_name = name; |
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c index 135504b60425..e31d574d8860 100644 --- a/drivers/usb/gadget/udc/udc-core.c +++ b/drivers/usb/gadget/udc/udc-core.c | |||
@@ -411,7 +411,7 @@ err1: | |||
411 | return ret; | 411 | return ret; |
412 | } | 412 | } |
413 | 413 | ||
414 | int udc_attach_driver(const char *name, struct usb_gadget_driver *driver) | 414 | int usb_udc_attach_driver(const char *name, struct usb_gadget_driver *driver) |
415 | { | 415 | { |
416 | struct usb_udc *udc = NULL; | 416 | struct usb_udc *udc = NULL; |
417 | int ret = -ENODEV; | 417 | int ret = -ENODEV; |
@@ -435,7 +435,7 @@ out: | |||
435 | mutex_unlock(&udc_lock); | 435 | mutex_unlock(&udc_lock); |
436 | return ret; | 436 | return ret; |
437 | } | 437 | } |
438 | EXPORT_SYMBOL_GPL(udc_attach_driver); | 438 | EXPORT_SYMBOL_GPL(usb_udc_attach_driver); |
439 | 439 | ||
440 | int usb_gadget_probe_driver(struct usb_gadget_driver *driver) | 440 | int usb_gadget_probe_driver(struct usb_gadget_driver *driver) |
441 | { | 441 | { |
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index 70965fc829d3..70ddb3943b62 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h | |||
@@ -924,7 +924,7 @@ extern int usb_add_gadget_udc_release(struct device *parent, | |||
924 | struct usb_gadget *gadget, void (*release)(struct device *dev)); | 924 | struct usb_gadget *gadget, void (*release)(struct device *dev)); |
925 | extern int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget); | 925 | extern int usb_add_gadget_udc(struct device *parent, struct usb_gadget *gadget); |
926 | extern void usb_del_gadget_udc(struct usb_gadget *gadget); | 926 | extern void usb_del_gadget_udc(struct usb_gadget *gadget); |
927 | extern int udc_attach_driver(const char *name, | 927 | extern int usb_udc_attach_driver(const char *name, |
928 | struct usb_gadget_driver *driver); | 928 | struct usb_gadget_driver *driver); |
929 | 929 | ||
930 | /*-------------------------------------------------------------------------*/ | 930 | /*-------------------------------------------------------------------------*/ |