Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 71de6b63f15924e5aed2de0b975efc5117c0ca75

Authored by Matthias Kaehlcke
Committed by Greg Kroah-Hartman
1 parent 15739bb502
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

USB: atmel_usba_udc: use helper functions to determine endpoint type and direction 

Use helper functions to determine the type and direction of an endpoint
instead of fiddling with bEndpointAddress and bmAttributes

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/usb/gadget/atmel_usba_udc.c
Diff comments   View file @ 71de6b6
... ... @@ -550,12 +550,12 @@
550 550 DBG(DBG_HW, "%s: EPT_SIZE = %lu (maxpacket = %lu)\n",
551 551 ep->ep.name, ept_cfg, maxpacket);
552 552  
553   - if ((desc->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) {
  553 + if (usb_endpoint_dir_in(desc)) {
554 554 ep->is_in = 1;
555 555 ept_cfg |= USBA_EPT_DIR_IN;
556 556 }
557 557  
558   - switch (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) {
  558 + switch (usb_endpoint_type(desc)) {
559 559 case USB_ENDPOINT_XFER_CONTROL:
560 560 ept_cfg |= USBA_BF(EPT_TYPE, USBA_EPT_TYPE_CONTROL);
561 561 ept_cfg |= USBA_BF(BK_NUMBER, USBA_BK_NUMBER_ONE);