From 52a59cf1e74441d95174e607836ee76aa956e4cc Mon Sep 17 00:00:00 2001 From: Shraddha Barke Date: Sat, 12 Sep 2015 15:04:35 +0530 Subject: [PATCH] Staging: ft1000: ft1000-usb: Use USB API functions rather than constants Introduce the use of the function usb_endpoint_is_bulk_in(). Signed-off-by: Shraddha Barke Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c index fd255c62083f..d1ba0b827a55 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c @@ -111,17 +111,13 @@ static int ft1000_probe(struct usb_interface *interface, pr_debug("endpoint %d\n", i); pr_debug("bEndpointAddress=%x, bmAttributes=%x\n", endpoint->bEndpointAddress, endpoint->bmAttributes); - if ((endpoint->bEndpointAddress & USB_DIR_IN) - && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == - USB_ENDPOINT_XFER_BULK)) { + if (usb_endpoint_is_bulk_in(endpoint)) { ft1000dev->bulk_in_endpointAddr = endpoint->bEndpointAddress; pr_debug("in: %d\n", endpoint->bEndpointAddress); } - if (!(endpoint->bEndpointAddress & USB_DIR_IN) - && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == - USB_ENDPOINT_XFER_BULK)) { + if (usb_endpoint_is_bulk_in(endpoint)) { ft1000dev->bulk_out_endpointAddr = endpoint->bEndpointAddress; pr_debug("out: %d\n", endpoint->bEndpointAddress); -- 2.20.1