From 66ffc87586e04d09f259bbca74f05b156d4cc96f Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Sat, 7 Mar 2015 22:48:55 -0700 Subject: [PATCH] usb: dwc2: simplify wait_for_chhltd toggle is never NULL. Simplify the code by removing handling of when it is NULL. Signed-off-by: Stephen Warren --- drivers/usb/host/dwc2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index e8a7e713c8..5a1c44a8fb 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c @@ -724,11 +724,9 @@ int wait_for_chhltd(uint32_t *sub, int *toggle) hctsiz = readl(&hc_regs->hctsiz); *sub = (hctsiz & DWC2_HCTSIZ_XFERSIZE_MASK) >> DWC2_HCTSIZ_XFERSIZE_OFFSET; - if (toggle) - *toggle = (hctsiz & DWC2_HCTSIZ_PID_MASK) >> - DWC2_HCTSIZ_PID_OFFSET; + *toggle = (hctsiz & DWC2_HCTSIZ_PID_MASK) >> DWC2_HCTSIZ_PID_OFFSET; - debug("%s: sub=%u toggle=%d\n", __func__, *sub, toggle ? *toggle : -1); + debug("%s: sub=%u toggle=%d\n", __func__, *sub, *toggle); return 0; } -- 2.30.2