iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: dwc2: only read the snpsid register once

Browse Source 
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@stdin.nl>
Acked-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthijs Kooijman 2013-08-30 18:45:14 +02:00 committed by Greg Kroah-Hartman
parent f923463335
commit 1c58ce1339
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/dwc2/hcd.c
View File

@ -2734,7 +2734,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq,
{ {
struct usb_hcd *hcd; struct usb_hcd *hcd;
struct dwc2_host_chan *channel; struct dwc2_host_chan *channel;
u32 snpsid, gusbcfg, hcfg; u32 gusbcfg, hcfg;
int i, num_channels; int i, num_channels;
int retval = -ENOMEM; int retval = -ENOMEM;
@ -2746,10 +2746,11 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq,
* 0x45f42xxx or 0x45f43xxx, which corresponds to either "OT2" or "OT3", * 0x45f42xxx or 0x45f43xxx, which corresponds to either "OT2" or "OT3",
* as in "OTG version 2.xx" or "OTG version 3.xx". * as in "OTG version 2.xx" or "OTG version 3.xx".
*/ */
snpsid = readl(hsotg->regs + GSNPSID); hsotg->snpsid = readl(hsotg->regs + GSNPSID);
if ((snpsid & 0xfffff000) != 0x4f542000 && if ((hsotg->snpsid & 0xfffff000) != 0x4f542000 &&
(snpsid & 0xfffff000) != 0x4f543000) { (hsotg->snpsid & 0xfffff000) != 0x4f543000) {
dev_err(hsotg->dev, "Bad value for GSNPSID: 0x%08x\n", snpsid); dev_err(hsotg->dev, "Bad value for GSNPSID: 0x%08x\n",
hsotg->snpsid);
retval = -ENODEV; retval = -ENODEV;
goto error1; goto error1;
} }
@ -2880,7 +2881,6 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq,
} }
INIT_WORK(&hsotg->wf_otg, dwc2_conn_id_status_change); 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", dev_dbg(hsotg->dev, "Core Release: %1x.%1x%1x%1x\n",
hsotg->snpsid >> 12 & 0xf, hsotg->snpsid >> 8 & 0xf, hsotg->snpsid >> 12 & 0xf, hsotg->snpsid >> 8 & 0xf,
hsotg->snpsid >> 4 & 0xf, hsotg->snpsid & 0xf); hsotg->snpsid >> 4 & 0xf, hsotg->snpsid & 0xf);