1 files changed, 17 insertions, 25 deletions

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 70cacbbe7fb9..7113d16e2d3a 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -113,15 +113,13 @@ static int last_trb(struct xhci_hcd *xhci, struct xhci_ring *ring,
         if (ring == xhci->event_ring)
                 return trb == &seg->trbs[TRBS_PER_SEGMENT];
         else
-                return (le32_to_cpu(trb->link.control) & TRB_TYPE_BITMASK)
-                        == TRB_TYPE(TRB_LINK);
+                return TRB_TYPE_LINK_LE32(trb->link.control);
 }
 
 static int enqueue_is_link_trb(struct xhci_ring *ring)
 {
         struct xhci_link_trb *link = &ring->enqueue->link;
-        return ((le32_to_cpu(link->control) & TRB_TYPE_BITMASK) ==
-                TRB_TYPE(TRB_LINK));
+        return TRB_TYPE_LINK_LE32(link->control);
 }
 
 /* Updates trb to point to the next TRB in the ring, and updates seg if the next
@@ -372,7 +370,7 @@ static struct xhci_segment *find_trb_seg(
         while (cur_seg->trbs > trb ||
                         &cur_seg->trbs[TRBS_PER_SEGMENT - 1] < trb) {
                 generic_trb = &cur_seg->trbs[TRBS_PER_SEGMENT - 1].generic;
-                if (le32_to_cpu(generic_trb->field[3]) & LINK_TOGGLE)
+                if (generic_trb->field[3] & cpu_to_le32(LINK_TOGGLE))
                         *cycle_state ^= 0x1;
                 cur_seg = cur_seg->next;
                 if (cur_seg == start_seg)
@@ -489,8 +487,8 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
         }
 
         trb = &state->new_deq_ptr->generic;
-        if ((le32_to_cpu(trb->field[3]) & TRB_TYPE_BITMASK) ==
-            TRB_TYPE(TRB_LINK) && (le32_to_cpu(trb->field[3]) & LINK_TOGGLE))
+        if (TRB_TYPE_LINK_LE32(trb->field[3]) &&
+            (trb->field[3] & cpu_to_le32(LINK_TOGGLE)))
                 state->new_cycle_state ^= 0x1;
         next_trb(xhci, ep_ring, &state->new_deq_seg, &state->new_deq_ptr);
 
@@ -525,8 +523,7 @@ static void td_to_noop(struct xhci_hcd *xhci, struct xhci_ring *ep_ring,
         for (cur_seg = cur_td->start_seg, cur_trb = cur_td->first_trb;
                         true;
                         next_trb(xhci, ep_ring, &cur_seg, &cur_trb)) {
-                if ((le32_to_cpu(cur_trb->generic.field[3]) & TRB_TYPE_BITMASK)
-                    == TRB_TYPE(TRB_LINK)) {
+                if (TRB_TYPE_LINK_LE32(cur_trb->generic.field[3])) {
                         /* Unchain any chained Link TRBs, but
                          * leave the pointers intact.
                          */
@@ -1000,7 +997,7 @@ static void handle_reset_ep_completion(struct xhci_hcd *xhci,
          * but we don't care.
          */
         xhci_dbg(xhci, "Ignoring reset ep completion code of %u\n",
-                 (unsigned int) GET_COMP_CODE(le32_to_cpu(event->status)));
+                 GET_COMP_CODE(le32_to_cpu(event->status)));
 
         /* HW with the reset endpoint quirk needs to have a configure endpoint
          * command complete before the endpoint can be used.  Queue that here
@@ -1458,7 +1455,8 @@ static int xhci_requires_manual_halt_cleanup(struct xhci_hcd *xhci,
                  * endpoint anyway.  Check if a babble halted the
                  * endpoint.
                  */
-                if ((le32_to_cpu(ep_ctx->ep_info) & EP_STATE_MASK) == EP_STATE_HALTED)
+                if ((ep_ctx->ep_info & cpu_to_le32(EP_STATE_MASK)) ==
+                    cpu_to_le32(EP_STATE_HALTED))
                         return 1;
 
         return 0;
@@ -1753,10 +1751,8 @@ static int process_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td,
                 for (cur_trb = ep_ring->dequeue,
                      cur_seg = ep_ring->deq_seg; cur_trb != event_trb;
                      next_trb(xhci, ep_ring, &cur_seg, &cur_trb)) {
-                        if ((le32_to_cpu(cur_trb->generic.field[3]) &
-                         TRB_TYPE_BITMASK) != TRB_TYPE(TRB_TR_NOOP) &&
-                            (le32_to_cpu(cur_trb->generic.field[3]) &
-                         TRB_TYPE_BITMASK) != TRB_TYPE(TRB_LINK))
+                        if (!TRB_TYPE_NOOP_LE32(cur_trb->generic.field[3]) &&
+                            !TRB_TYPE_LINK_LE32(cur_trb->generic.field[3]))
                                 len += TRB_LEN(le32_to_cpu(cur_trb->generic.field[2]));
                 }
                 len += TRB_LEN(le32_to_cpu(cur_trb->generic.field[2])) -
@@ -1885,10 +1881,8 @@ static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
                 for (cur_trb = ep_ring->dequeue, cur_seg = ep_ring->deq_seg;
                                 cur_trb != event_trb;
                                 next_trb(xhci, ep_ring, &cur_seg, &cur_trb)) {
-                        if ((le32_to_cpu(cur_trb->generic.field[3]) &
-                         TRB_TYPE_BITMASK) != TRB_TYPE(TRB_TR_NOOP) &&
-                            (le32_to_cpu(cur_trb->generic.field[3]) &
-                         TRB_TYPE_BITMASK) != TRB_TYPE(TRB_LINK))
+                        if (!TRB_TYPE_NOOP_LE32(cur_trb->generic.field[3]) &&
+                            !TRB_TYPE_LINK_LE32(cur_trb->generic.field[3]))
                                 td->urb->actual_length +=
                                         TRB_LEN(le32_to_cpu(cur_trb->generic.field[2]));
                 }
@@ -2047,8 +2041,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                                   TRB_TO_SLOT_ID(le32_to_cpu(event->flags)),
                                   ep_index);
                         xhci_dbg(xhci, "Event TRB with TRB type ID %u\n",
-                                 (unsigned int) (le32_to_cpu(event->flags)
-                                                 & TRB_TYPE_BITMASK)>>10);
+                                 (le32_to_cpu(event->flags) &
+                                  TRB_TYPE_BITMASK)>>10);
                         xhci_print_trb_offsets(xhci, (union xhci_trb *) event);
                         if (ep->skip) {
                                 ep->skip = false;
@@ -2119,9 +2113,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                  * corresponding TD has been cancelled. Just ignore
                  * the TD.
                  */
-                if ((le32_to_cpu(event_trb->generic.field[3])
-                             & TRB_TYPE_BITMASK)
-                                 == TRB_TYPE(TRB_TR_NOOP)) {
+                if (TRB_TYPE_NOOP_LE32(event_trb->generic.field[3])) {
                         xhci_dbg(xhci,
                                  "event_trb is a no-op TRB. Skip it\n");
                         goto cleanup;
@@ -2452,7 +2444,7 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring,
                                 next->link.control |= cpu_to_le32(TRB_CHAIN);
 
                         wmb();
-                        next->link.control ^= cpu_to_le32((u32) TRB_CYCLE);
+                        next->link.control ^= cpu_to_le32(TRB_CYCLE);
 
                         /* Toggle the cycle bit after the last ring segment. */
                         if (last_trb_on_last_seg(xhci, ring, ring->enq_seg, next)) {