Avoid namespace pollution. Signed-off-by: Igor Kotrasinski <i.kotrasinsk@xxxxxxxxx> --- drivers/usb/usbip/vudc.h | 2 +- drivers/usb/usbip/vudc_dev.c | 2 +- drivers/usb/usbip/vudc_rx.c | 2 +- drivers/usb/usbip/vudc_transfer.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/usb/usbip/vudc.h b/drivers/usb/usbip/vudc.h index 3fd5772..19140d6 100644 --- a/drivers/usb/usbip/vudc.h +++ b/drivers/usb/usbip/vudc.h @@ -174,7 +174,7 @@ void v_stop_timer(struct vudc *udc); struct urbp *alloc_urbp(void); void free_urbp_and_urb(struct urbp *urb_p); -struct vep *find_endpoint(struct vudc *udc, u8 address); +struct vep *vep_find_endpoint(struct vudc *udc, u8 address); struct vudc_device *alloc_vudc_device(int devid); void put_vudc_device(struct vudc_device *udc_dev); diff --git a/drivers/usb/usbip/vudc_dev.c b/drivers/usb/usbip/vudc_dev.c index 231571f..e6bfdbf 100644 --- a/drivers/usb/usbip/vudc_dev.c +++ b/drivers/usb/usbip/vudc_dev.c @@ -114,7 +114,7 @@ static void stop_activity(struct vudc *udc) } } -struct vep *find_endpoint(struct vudc *udc, u8 address) +struct vep *vep_find_endpoint(struct vudc *udc, u8 address) { int i; diff --git a/drivers/usb/usbip/vudc_rx.c b/drivers/usb/usbip/vudc_rx.c index 2ab5023..f8d7f41 100644 --- a/drivers/usb/usbip/vudc_rx.c +++ b/drivers/usb/usbip/vudc_rx.c @@ -117,7 +117,7 @@ static int v_recv_cmd_submit(struct vudc *udc, address |= USB_DIR_IN; spin_lock_irq(&udc->lock); - urb_p->ep = find_endpoint(udc, address); + urb_p->ep = vep_find_endpoint(udc, address); if (!urb_p->ep) { /* we don't know the type, there may be isoc data! */ dev_err(&udc->pdev->dev, "request to nonexistent endpoint"); diff --git a/drivers/usb/usbip/vudc_transfer.c b/drivers/usb/usbip/vudc_transfer.c index 842e811..9d42c92 100644 --- a/drivers/usb/usbip/vudc_transfer.c +++ b/drivers/usb/usbip/vudc_transfer.c @@ -110,7 +110,7 @@ static int handle_control_request(struct vudc *udc, struct urb *urb, } } else if (setup->bRequestType == EP_REQUEST) { /* endpoint halt */ - ep2 = find_endpoint(udc, w_index); + ep2 = vep_find_endpoint(udc, w_index); if (!ep2 || ep2->ep.name == udc->ep[0].ep.name) { ret_val = -EOPNOTSUPP; break; @@ -143,7 +143,7 @@ static int handle_control_request(struct vudc *udc, struct urb *urb, } } else if (setup->bRequestType == EP_REQUEST) { /* endpoint halt */ - ep2 = find_endpoint(udc, w_index); + ep2 = vep_find_endpoint(udc, w_index); if (!ep2) { ret_val = -EOPNOTSUPP; break; @@ -167,7 +167,7 @@ static int handle_control_request(struct vudc *udc, struct urb *urb, buf = (char *)urb->transfer_buffer; if (urb->transfer_buffer_length > 0) { if (setup->bRequestType == EP_INREQUEST) { - ep2 = find_endpoint(udc, w_index); + ep2 = vep_find_endpoint(udc, w_index); if (!ep2) { ret_val = -EOPNOTSUPP; break; -- 2.7.3 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html