Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1486321

[PATCH 05/15] usb: chipidea: imx: Change switch order

Show all headers | View raw

Each USB controller have different behaviour, so in order to avoid to have
several "swicth(data->index)" and lock/unlock, we prefer to get the index
and then test for features if they exist for this index.

Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
---
 drivers/usb/chipidea/usbmisc_imx.c | 44 +++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index 20d02a5..ed324d1 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -199,31 +199,45 @@ static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
 	val |= MX53_USB_PLL_DIV_24_MHZ;
 	writel(val, usbmisc->base + MX53_USB_OTG_PHY_CTRL_1_OFFSET);
 
-	if (data->disable_oc) {
-		spin_lock_irqsave(&usbmisc->lock, flags);
-		switch (data->index) {
+	spin_lock_irqsave(&usbmisc->lock, flags);
+
+	switch (data->index) {
 		case 0:
-			reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
-			val = readl(reg) | MX53_BM_OVER_CUR_DIS_OTG;
+			if (data->disable_oc) {
+				reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
+				val = readl(reg) | MX53_BM_OVER_CUR_DIS_OTG;
+				if (reg && val)
+					writel(val, reg);
+			}
 			break;
 		case 1:
-			reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
-			val = readl(reg) | MX53_BM_OVER_CUR_DIS_H1;
+			if (data->disable_oc) {
+				reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
+				val = readl(reg) | MX53_BM_OVER_CUR_DIS_H1;
+				if (reg && val)
+					writel(val, reg);
+			}
 			break;
 		case 2:
-			reg = usbmisc->base + MX53_USB_UH2_CTRL_OFFSET;
-			val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
+			if (data->disable_oc) {
+				reg = usbmisc->base + MX53_USB_UH2_CTRL_OFFSET;
+				val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
+				if (reg && val)
+					writel(val, reg);
+			}
 			break;
 		case 3:
-			reg = usbmisc->base + MX53_USB_UH3_CTRL_OFFSET;
-			val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
+			if (data->disable_oc) {
+				reg = usbmisc->base + MX53_USB_UH3_CTRL_OFFSET;
+				val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
+				if (reg && val)
+					writel(val, reg);
+			}
 			break;
-		}
-		if (reg && val)
-			writel(val, reg);
-		spin_unlock_irqrestore(&usbmisc->lock, flags);
 	}
 
+	spin_unlock_irqrestore(&usbmisc->lock, flags);
+
 	return 0;
 }
 
-- 
2.1.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 05/15] usb: chipidea: imx: Change switch order Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> - 2016-09-19 12:20 +0200
  Re: [PATCH 05/15] usb: chipidea: imx: Change switch order Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> - 2016-09-19 12:30 +0200
  Re: [PATCH 05/15] usb: chipidea: imx: Change switch order Joe Perches <joe@perches.com> - 2016-09-19 12:40 +0200

csiph-web