From: Shraddha Barke <shraddha.6596@gmail.com>
Date: Sat, 12 Sep 2015 09:34:35 +0000 (+0530)
Subject: Staging: ft1000: ft1000-usb: Use USB API functions rather than constants
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=52a59cf1e74441d95174e607836ee76aa956e4cc;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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 <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

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);