aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/dwc3
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2014-05-15 08:53:32 -0400
committerFelipe Balbi <balbi@ti.com>2014-05-15 11:26:21 -0400
commitb09e99ee7c2b7ee80cca128b93b07fb830e6ecad (patch)
treec3ef26babf9053b0d4c41a620c4def8389e88e5c /drivers/usb/dwc3
parent7419485f197c436d41535df78ddea1085042d271 (diff)
usb: dwc3: no need to initialize ret variable
First usage of ret variable will re-write initial value. Thus, there is no need to initialize it. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/dwc3')
-rw-r--r--drivers/usb/dwc3/core.c2
-rw-r--r--drivers/usb/dwc3/dwc3-exynos.c12
-rw-r--r--drivers/usb/dwc3/dwc3-omap.c2
-rw-r--r--drivers/usb/dwc3/dwc3-pci.c2
-rw-r--r--drivers/usb/dwc3/gadget.c2
5 files changed, 9 insertions, 11 deletions
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index af8c8f6e67b3..3f59c1247825 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -626,7 +626,7 @@ static int dwc3_probe(struct platform_device *pdev)
626 struct resource *res; 626 struct resource *res;
627 struct dwc3 *dwc; 627 struct dwc3 *dwc;
628 628
629 int ret = -ENOMEM; 629 int ret;
630 630
631 void __iomem *regs; 631 void __iomem *regs;
632 void *mem; 632 void *mem;
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index 0ed85834bfec..f9fb8adb785b 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -110,12 +110,12 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
110 struct device *dev = &pdev->dev; 110 struct device *dev = &pdev->dev;
111 struct device_node *node = dev->of_node; 111 struct device_node *node = dev->of_node;
112 112
113 int ret = -ENOMEM; 113 int ret;
114 114
115 exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL); 115 exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
116 if (!exynos) { 116 if (!exynos) {
117 dev_err(dev, "not enough memory\n"); 117 dev_err(dev, "not enough memory\n");
118 goto err1; 118 return -ENOMEM;
119 } 119 }
120 120
121 /* 121 /*
@@ -125,21 +125,20 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
125 */ 125 */
126 ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32)); 126 ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
127 if (ret) 127 if (ret)
128 goto err1; 128 return ret;
129 129
130 platform_set_drvdata(pdev, exynos); 130 platform_set_drvdata(pdev, exynos);
131 131
132 ret = dwc3_exynos_register_phys(exynos); 132 ret = dwc3_exynos_register_phys(exynos);
133 if (ret) { 133 if (ret) {
134 dev_err(dev, "couldn't register PHYs\n"); 134 dev_err(dev, "couldn't register PHYs\n");
135 goto err1; 135 return ret;
136 } 136 }
137 137
138 clk = devm_clk_get(dev, "usbdrd30"); 138 clk = devm_clk_get(dev, "usbdrd30");
139 if (IS_ERR(clk)) { 139 if (IS_ERR(clk)) {
140 dev_err(dev, "couldn't get clock\n"); 140 dev_err(dev, "couldn't get clock\n");
141 ret = -EINVAL; 141 return -EINVAL;
142 goto err1;
143 } 142 }
144 143
145 exynos->dev = dev; 144 exynos->dev = dev;
@@ -189,7 +188,6 @@ err3:
189 regulator_disable(exynos->vdd33); 188 regulator_disable(exynos->vdd33);
190err2: 189err2:
191 clk_disable_unprepare(clk); 190 clk_disable_unprepare(clk);
192err1:
193 return ret; 191 return ret;
194} 192}
195 193
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 1160ff41bed4..4af4c3567656 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -393,7 +393,7 @@ static int dwc3_omap_probe(struct platform_device *pdev)
393 struct extcon_dev *edev; 393 struct extcon_dev *edev;
394 struct regulator *vbus_reg = NULL; 394 struct regulator *vbus_reg = NULL;
395 395
396 int ret = -ENOMEM; 396 int ret;
397 int irq; 397 int irq;
398 398
399 int utmi_mode = 0; 399 int utmi_mode = 0;
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 1ed95e0386eb..e76d1ca5531c 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -99,7 +99,7 @@ static int dwc3_pci_probe(struct pci_dev *pci,
99 struct resource res[2]; 99 struct resource res[2];
100 struct platform_device *dwc3; 100 struct platform_device *dwc3;
101 struct dwc3_pci *glue; 101 struct dwc3_pci *glue;
102 int ret = -ENOMEM; 102 int ret;
103 struct device *dev = &pci->dev; 103 struct device *dev = &pci->dev;
104 104
105 glue = devm_kzalloc(dev, sizeof(*glue), GFP_KERNEL); 105 glue = devm_kzalloc(dev, sizeof(*glue), GFP_KERNEL);
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index e0b791050930..696b472274ef 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -584,7 +584,7 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
584{ 584{
585 struct dwc3 *dwc = dep->dwc; 585 struct dwc3 *dwc = dep->dwc;
586 u32 reg; 586 u32 reg;
587 int ret = -ENOMEM; 587 int ret;
588 588
589 dev_vdbg(dwc->dev, "Enabling %s\n", dep->name); 589 dev_vdbg(dwc->dev, "Enabling %s\n", dep->name);
590 590