On 2023/11/23 8:50, Marek Vasut wrote:
> Replace one type of terrible code formatting with a different
> type of terrible code formatting. No functional change.
>
> Signed-off-by: Marek Vasut
> ---
> Cc: Bin Meng
> Cc: Hector Martin
> ---
> drivers/usb/host/xhci-ring.c | 18 +++---
> 1 file changed, 7 insertions(+), 11 deletions(-)
>
Lol.
Reviewed-by: Hector Martin
> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
> index dabe6cf86af..be3e35102d6 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -543,9 +543,8 @@ static void reset_ep(struct usb_device *udev, int
> ep_index)
> if (!event)
> return;
>
> - BUG_ON(TRB_TO_SLOT_ID(le32_to_cpu(event->event_cmd.flags))
> - != udev->slot_id || GET_COMP_CODE(le32_to_cpu(
> - event->event_cmd.status)) != COMP_SUCCESS);
> + BUG_ON(TRB_TO_SLOT_ID(le32_to_cpu(event->event_cmd.flags)) !=
> udev->slot_id ||
> +GET_COMP_CODE(le32_to_cpu(event->event_cmd.status)) !=
> COMP_SUCCESS);
> xhci_acknowledge_event(ctrl);
> }
>
> @@ -578,8 +577,7 @@ static void abort_td(struct usb_device *udev, int
> ep_index)
> field = le32_to_cpu(event->trans_event.flags);
> BUG_ON(TRB_TO_SLOT_ID(field) != udev->slot_id);
> BUG_ON(TRB_TO_EP_INDEX(field) != ep_index);
> - BUG_ON(GET_COMP_CODE(le32_to_cpu(event->trans_event.transfer_len
> - != COMP_STOP)));
> +
> BUG_ON(GET_COMP_CODE(le32_to_cpu(event->trans_event.transfer_len !=
> COMP_STOP)));
> xhci_acknowledge_event(ctrl);
>
> event = xhci_wait_for_event(ctrl, TRB_COMPLETION);
> @@ -593,9 +591,8 @@ static void abort_td(struct usb_device *udev, int
> ep_index)
>
> comp = GET_COMP_CODE(le32_to_cpu(event->event_cmd.status));
> BUG_ON(type != TRB_COMPLETION ||
> - TRB_TO_SLOT_ID(le32_to_cpu(event->event_cmd.flags))
> - != udev->slot_id || (comp != COMP_SUCCESS && comp
> - != COMP_CTX_STATE));
> + TRB_TO_SLOT_ID(le32_to_cpu(event->event_cmd.flags)) !=
> udev->slot_id ||
> + (comp != COMP_SUCCESS && comp != COMP_CTX_STATE));
> xhci_acknowledge_event(ctrl);
>
> addr = xhci_trb_virt_to_dma(ring->enq_seg,
> @@ -605,9 +602,8 @@ static void abort_td(struct usb_device *udev, int
> ep_index)
> if (!event)
> return;
>
> - BUG_ON(TRB_TO_SLOT_ID(le32_to_cpu(event->event_cmd.flags))
> - != udev->slot_id || GET_COMP_CODE(le32_to_cpu(
> - event->event_cmd.status)) != COMP_SUCCESS);
> + BUG_ON(TRB_TO_SLOT_ID(le32_to_cpu(event->event_cmd.flags)) !=
> udev->slot_id ||
> +GET_COMP_CODE(le32_to_cpu(event->event_cmd.status)) !=
> COMP_SUCCESS);
> xhci_acknowledge_event(ctrl);
> }
>
- Hector
