libertas: remove useless USB endpoint mask definitions

[Marcelo Tosatti]

Commit:     a8733d9e1827d412e74e40ce3e4a493a3a53b49d
Parent:     71a9e1103aae33bacc4f28ae8a0f8a11fe3ce0f9
commit a8733d9e1827d412e74e40ce3e4a493a3a53b49d
Author:     Marcelo Tosatti <mtosatti at redhat.com>
AuthorDate: Thu Dec 7 00:38:54 2006 -0200
Commit:     Marcelo Tosatti <mtosatti at redhat.com>
CommitDate: Thu Dec 7 00:38:54 2006 -0200

    libertas: remove useless USB endpoint mask definitions
    
    Use Linux names directly.
    
    Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
---
 drivers/net/wireless/libertas/if_usb.c |   16 ++++++++--------
 drivers/net/wireless/libertas/if_usb.h |    7 -------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index e97c953..2722490 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -238,9 +238,9 @@ static int if_usb_probe(struct usb_inter
 
 	for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
 		endpoint = &iface_desc->endpoint[i].desc;
-		if ((endpoint->bEndpointAddress & BULK_ENDPOINT_PRESENT)
-		    && ((endpoint->bmAttributes & BULK_ENDPOINT_MASK) ==
-			BULK_ENDPOINT_FOUND)) {
+		if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
+		    && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+			USB_ENDPOINT_XFER_BULK)) {
 			/* we found a bulk in endpoint */
 			dprintk(1, "Bulk in size is %d\n",
 			       endpoint->wMaxPacketSize);
@@ -257,16 +257,16 @@ static int if_usb_probe(struct usb_inter
 			    endpoint->wMaxPacketSize;
 			usb_cardp->bulk_in_endpointAddr =
 			    (endpoint->
-			     bEndpointAddress & ENDPOINT_NUMBER_MASK);
+			     bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
 			dprintk(1, "in_endpoint = %d\n",
 			       endpoint->bEndpointAddress);
 		}
 
 		if (((endpoint->
-		      bEndpointAddress & BULK_ENDPOINT_PRESENT) ==
-		     BULK_OUT_PRESENT)
-		    && ((endpoint->bmAttributes & BULK_ENDPOINT_MASK) ==
-			BULK_ENDPOINT_FOUND)) {
+		      bEndpointAddress & USB_ENDPOINT_DIR_MASK) ==
+		     USB_DIR_OUT)
+		    && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+			USB_ENDPOINT_XFER_BULK)) {
 			/* We found bulk out endpoint */
 			if (!
 			    (usb_cardp->tx_urb =
diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h
index 90635d4..9b766b1 100644
--- a/drivers/net/wireless/libertas/if_usb.h
+++ b/drivers/net/wireless/libertas/if_usb.h
@@ -29,13 +29,6 @@ #define CMD_TYPE_REQUEST                
 #define CMD_TYPE_DATA                   0xBEADC0DE
 #define CMD_TYPE_INDICATION             0xBEEFFACE
 
-#define BULK_ENDPOINT_PRESENT		USB_ENDPOINT_DIR_MASK
-#define BULK_ENDPOINT_MASK		USB_ENDPOINT_XFERTYPE_MASK
-#define BULK_ENDPOINT_FOUND		USB_ENDPOINT_XFER_BULK
-#define ENDPOINT_NUMBER_MASK		USB_ENDPOINT_NUMBER_MASK
-
-#define BULK_OUT_PRESENT	0x00
-
 #define IPFIELD_ALIGN_OFFSET	2
 
 #define USB8388_VID_1	0x1286