projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
musb
/
musb_gadget.c
diff --git
a/drivers/usb/musb/musb_gadget.c
b/drivers/usb/musb/musb_gadget.c
index 6197daeab8f9e9cc9e09e4e4a31cc46ae4430e5e..c7ebd0867fcca9281ecf25abc130c91389444240 100644
(file)
--- a/
drivers/usb/musb/musb_gadget.c
+++ b/
drivers/usb/musb/musb_gadget.c
@@
-575,7
+575,7
@@
static void rxstate(struct musb *musb, struct musb_request *req)
struct usb_request *request = &req->request;
struct musb_ep *musb_ep = &musb->endpoints[epnum].ep_out;
void __iomem *epio = musb->endpoints[epnum].regs;
struct usb_request *request = &req->request;
struct musb_ep *musb_ep = &musb->endpoints[epnum].ep_out;
void __iomem *epio = musb->endpoints[epnum].regs;
- u
16
fifo_count = 0;
+ u
nsigned
fifo_count = 0;
u16 len = musb_ep->packet_sz;
csr = musb_readw(epio, MUSB_RXCSR);
u16 len = musb_ep->packet_sz;
csr = musb_readw(epio, MUSB_RXCSR);
@@
-687,7
+687,7
@@
static void rxstate(struct musb *musb, struct musb_request *req)
len, fifo_count,
musb_ep->packet_sz);
len, fifo_count,
musb_ep->packet_sz);
- fifo_count = min
(
len, fifo_count);
+ fifo_count = min
_t(unsigned,
len, fifo_count);
#ifdef CONFIG_USB_TUSB_OMAP_DMA
if (tusb_dma_omap() && musb_ep->dma) {
#ifdef CONFIG_USB_TUSB_OMAP_DMA
if (tusb_dma_omap() && musb_ep->dma) {
@@
-874,10
+874,10
@@
static int musb_gadget_enable(struct usb_ep *ep,
status = -EBUSY;
goto fail;
}
status = -EBUSY;
goto fail;
}
- musb_ep->type =
desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK
;
+ musb_ep->type =
usb_endpoint_type(desc)
;
/* check direction and (later) maxpacket size against endpoint */
/* check direction and (later) maxpacket size against endpoint */
- if (
(desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK
) != epnum)
+ if (
usb_endpoint_num(desc
) != epnum)
goto fail;
/* REVISIT this rules out high bandwidth periodic transfers */
goto fail;
/* REVISIT this rules out high bandwidth periodic transfers */
@@
-890,7
+890,7
@@
static int musb_gadget_enable(struct usb_ep *ep,
* packet size (or fail), set the mode, clear the fifo
*/
musb_ep_select(mbase, epnum);
* packet size (or fail), set the mode, clear the fifo
*/
musb_ep_select(mbase, epnum);
- if (
desc->bEndpointAddress & USB_DIR_IN
) {
+ if (
usb_endpoint_dir_in(desc)
) {
u16 int_txe = musb_readw(mbase, MUSB_INTRTXE);
if (hw_ep->is_shared_fifo)
u16 int_txe = musb_readw(mbase, MUSB_INTRTXE);
if (hw_ep->is_shared_fifo)