[RFC PATCH 01/20] xhci: cleanup remaining cycle bit toggles via ternary conditional

[Dan Williams]

These can simply be toggled via xor.

Signed-off-by: Dan Williams <dan.j.willi...@intel.com>
---
 drivers/usb/host/xhci-ring.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 749fc68eb5c1..0efbbf0b6233 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -237,9 +237,9 @@ static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring 
*ring,
                        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)) {
-                               ring->cycle_state = (ring->cycle_state ? 0 : 1);
-                       }
+                       if (last_trb_on_last_seg(xhci, ring, ring->enq_seg,
+                                               next))
+                               ring->cycle_state ^= 1;
                }
                ring->enq_seg = ring->enq_seg->next;
                ring->enqueue = ring->enq_seg->trbs;
@@ -2875,9 +2875,9 @@ static int prepare_ring(struct xhci_hcd *xhci, struct 
xhci_ring *ep_ring,
                        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)) {
-                               ring->cycle_state = (ring->cycle_state ? 0 : 1);
-                       }
+                       if (last_trb_on_last_seg(xhci, ring, ring->enq_seg,
+                                               next))
+                               ring->cycle_state ^= 1;
                        ring->enq_seg = ring->enq_seg->next;
                        ring->enqueue = ring->enq_seg->trbs;
                        next = ring->enqueue;

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html