aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVarka Bhadram <varkabhadram@gmail.com>2014-11-03 21:21:25 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-07 12:01:51 -0500
commit2062ff489ca9d97b4bfee56e944727d9b02b0d63 (patch)
tree4bbde9a3a23fd51a7efc1205ffe09c85668ea477
parent69b89c603bdbc495a751c926b6311ce3db018f04 (diff)
host: ehci-platform: remove duplicate check on resource
Sanity check on resource happening with devm_ioremap_resource(). Signed-off-by: Varka Bhadram <varkab@cdac.in> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/ehci-platform.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index da056fe9d15b..35a9aeda0168 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -164,11 +164,6 @@ static int ehci_platform_probe(struct platform_device *dev)
164 dev_err(&dev->dev, "no irq provided"); 164 dev_err(&dev->dev, "no irq provided");
165 return irq; 165 return irq;
166 } 166 }
167 res_mem = platform_get_resource(dev, IORESOURCE_MEM, 0);
168 if (!res_mem) {
169 dev_err(&dev->dev, "no memory resource provided");
170 return -ENXIO;
171 }
172 167
173 hcd = usb_create_hcd(&ehci_platform_hc_driver, &dev->dev, 168 hcd = usb_create_hcd(&ehci_platform_hc_driver, &dev->dev,
174 dev_name(&dev->dev)); 169 dev_name(&dev->dev));
@@ -250,14 +245,15 @@ static int ehci_platform_probe(struct platform_device *dev)
250 goto err_reset; 245 goto err_reset;
251 } 246 }
252 247
253 hcd->rsrc_start = res_mem->start; 248 res_mem = platform_get_resource(dev, IORESOURCE_MEM, 0);
254 hcd->rsrc_len = resource_size(res_mem);
255
256 hcd->regs = devm_ioremap_resource(&dev->dev, res_mem); 249 hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
257 if (IS_ERR(hcd->regs)) { 250 if (IS_ERR(hcd->regs)) {
258 err = PTR_ERR(hcd->regs); 251 err = PTR_ERR(hcd->regs);
259 goto err_power; 252 goto err_power;
260 } 253 }
254 hcd->rsrc_start = res_mem->start;
255 hcd->rsrc_len = resource_size(res_mem);
256
261 err = usb_add_hcd(hcd, irq, IRQF_SHARED); 257 err = usb_add_hcd(hcd, irq, IRQF_SHARED);
262 if (err) 258 if (err)
263 goto err_power; 259 goto err_power;