From: Michael Trimarchi <michael@amarulasolutions.com>
Date: Thu, 29 Mar 2018 09:52:47 +0000 (+0800)
Subject: usb: chipidea: usbmisc: small clean up
X-Git-Tag: v4.17-rc1~126^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=274a1874bd7966eeb80b1a217b4e627e45c5fc73;p=thirdparty%2Fkernel%2Flinux.git

usb: chipidea: usbmisc: small clean up

The register write can be done outside the if and else condition

Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index 1f47ef6250693..34ad5bf8acd8d 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -315,13 +315,12 @@ static int usbmisc_imx6q_set_wakeup
 	val = readl(usbmisc->base + data->index * 4);
 	if (enabled) {
 		val |= wakeup_setting;
-		writel(val, usbmisc->base + data->index * 4);
 	} else {
 		if (val & MX6_BM_WAKEUP_INTR)
 			pr_debug("wakeup int at ci_hdrc.%d\n", data->index);
 		val &= ~wakeup_setting;
-		writel(val, usbmisc->base + data->index * 4);
 	}
+	writel(val, usbmisc->base + data->index * 4);
 	spin_unlock_irqrestore(&usbmisc->lock, flags);
 
 	return ret;