aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVarka Bhadram <varkabhadram@gmail.com>2014-11-03 21:21:12 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-07 12:01:50 -0500
commit04dc3150a3d341cda494b3689c14b334aa8f94e2 (patch)
tree9adbe885ca790a5988461f5ca29a41bf534ea650
parent0af6b07094b6ad560bc1a1d062a81aaaebc57199 (diff)
host: ohci-at91: 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/ohci-at91.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 6181549883af..39406607e53a 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -133,12 +133,6 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
133 struct resource *res; 133 struct resource *res;
134 int irq; 134 int irq;
135 135
136 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
137 if (!res) {
138 dev_dbg(dev, "hcd probe: missing memory resource\n");
139 return -ENXIO;
140 }
141
142 irq = platform_get_irq(pdev, 0); 136 irq = platform_get_irq(pdev, 0);
143 if (irq < 0) { 137 if (irq < 0) {
144 dev_dbg(dev, "hcd probe: missing irq resource\n"); 138 dev_dbg(dev, "hcd probe: missing irq resource\n");
@@ -148,14 +142,15 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
148 hcd = usb_create_hcd(driver, dev, "at91"); 142 hcd = usb_create_hcd(driver, dev, "at91");
149 if (!hcd) 143 if (!hcd)
150 return -ENOMEM; 144 return -ENOMEM;
151 hcd->rsrc_start = res->start;
152 hcd->rsrc_len = resource_size(res);
153 145
146 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
154 hcd->regs = devm_ioremap_resource(dev, res); 147 hcd->regs = devm_ioremap_resource(dev, res);
155 if (IS_ERR(hcd->regs)) { 148 if (IS_ERR(hcd->regs)) {
156 retval = PTR_ERR(hcd->regs); 149 retval = PTR_ERR(hcd->regs);
157 goto err; 150 goto err;
158 } 151 }
152 hcd->rsrc_start = res->start;
153 hcd->rsrc_len = resource_size(res);
159 154
160 iclk = devm_clk_get(dev, "ohci_clk"); 155 iclk = devm_clk_get(dev, "ohci_clk");
161 if (IS_ERR(iclk)) { 156 if (IS_ERR(iclk)) {