diff options
author | Varka Bhadram <varkabhadram@gmail.com> | 2014-11-03 21:21:23 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-07 12:01:50 -0500 |
commit | 073153bf227649057a911ff8d4383117fb866e2b (patch) | |
tree | b2539fdd46014b249bea10b115070d1636965740 | |
parent | d6e269ae4fb147eaa65ae6980064ee0c013fc7d6 (diff) |
host: ehci-octeon: 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-octeon.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c index 9051439039a7..2d0c4bcba579 100644 --- a/drivers/usb/host/ehci-octeon.c +++ b/drivers/usb/host/ehci-octeon.c | |||
@@ -106,12 +106,6 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev) | |||
106 | return -ENODEV; | 106 | return -ENODEV; |
107 | } | 107 | } |
108 | 108 | ||
109 | res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
110 | if (res_mem == NULL) { | ||
111 | dev_err(&pdev->dev, "No register space assigned\n"); | ||
112 | return -ENODEV; | ||
113 | } | ||
114 | |||
115 | /* | 109 | /* |
116 | * We can DMA from anywhere. But the descriptors must be in | 110 | * We can DMA from anywhere. But the descriptors must be in |
117 | * the lower 4GB. | 111 | * the lower 4GB. |
@@ -125,14 +119,14 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev) | |||
125 | if (!hcd) | 119 | if (!hcd) |
126 | return -ENOMEM; | 120 | return -ENOMEM; |
127 | 121 | ||
128 | hcd->rsrc_start = res_mem->start; | 122 | res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
129 | hcd->rsrc_len = resource_size(res_mem); | ||
130 | |||
131 | hcd->regs = devm_ioremap_resource(&pdev->dev, res_mem); | 123 | hcd->regs = devm_ioremap_resource(&pdev->dev, res_mem); |
132 | if (IS_ERR(hcd->regs)) { | 124 | if (IS_ERR(hcd->regs)) { |
133 | ret = PTR_ERR(hcd->regs); | 125 | ret = PTR_ERR(hcd->regs); |
134 | goto err1; | 126 | goto err1; |
135 | } | 127 | } |
128 | hcd->rsrc_start = res_mem->start; | ||
129 | hcd->rsrc_len = resource_size(res_mem); | ||
136 | 130 | ||
137 | ehci_octeon_start(); | 131 | ehci_octeon_start(); |
138 | 132 | ||