[PATCH 04/13] staging: dwc2: only read the snpsid register once

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This (read-only) register was read twice, storing it for later use the
second time. Now it is only read once, storing it right away.

Signed-off-by: Matthijs Kooijman <matthijs@xxxxxxxx>
---
 drivers/staging/dwc2/hcd.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/dwc2/hcd.c b/drivers/staging/dwc2/hcd.c
index b5713aa..5e8b2a8 100644
--- a/drivers/staging/dwc2/hcd.c
+++ b/drivers/staging/dwc2/hcd.c
@@ -2705,7 +2705,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq,
 {
 	struct usb_hcd *hcd;
 	struct dwc2_host_chan *channel;
-	u32 snpsid, gusbcfg, hcfg;
+	u32 gusbcfg, hcfg;
 	int i, num_channels;
 	int retval = -ENOMEM;
 
@@ -2717,10 +2717,11 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq,
 	 * 0x45f42xxx or 0x45f43xxx, which corresponds to either "OT2" or "OT3",
 	 * as in "OTG version 2.xx" or "OTG version 3.xx".
 	 */
-	snpsid = readl(hsotg->regs + GSNPSID);
-	if ((snpsid & 0xfffff000) != 0x4f542000 &&
-	    (snpsid & 0xfffff000) != 0x4f543000) {
-		dev_err(hsotg->dev, "Bad value for GSNPSID: 0x%08x\n", snpsid);
+	hsotg->snpsid = readl(hsotg->regs + GSNPSID);
+	if ((hsotg->snpsid & 0xfffff000) != 0x4f542000 &&
+	    (hsotg->snpsid & 0xfffff000) != 0x4f543000) {
+		dev_err(hsotg->dev, "Bad value for GSNPSID: 0x%08x\n",
+			hsotg->snpsid);
 		retval = -ENODEV;
 		goto error1;
 	}
@@ -2843,7 +2844,6 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq,
 	}
 	INIT_WORK(&hsotg->wf_otg, dwc2_conn_id_status_change);
 
-	hsotg->snpsid = readl(hsotg->regs + GSNPSID);
 	dev_dbg(hsotg->dev, "Core Release: %1x.%1x%1x%1x\n",
 		hsotg->snpsid >> 12 & 0xf, hsotg->snpsid >> 8 & 0xf,
 		hsotg->snpsid >> 4 & 0xf, hsotg->snpsid & 0xf);
-- 
1.8.3.rc1

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




[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux