aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVarka Bhadram <varkabhadram@gmail.com>2014-11-03 21:21:15 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-07 12:01:50 -0500
commitc6d413cebd82cf35b6a4257cd94724ff60cffb71 (patch)
tree42a5c7bd5db2ff8563c80eb0371e03fa4c2d047c
parent5c36cc64c5036463e608d2ccaaf71bec50112119 (diff)
host: ohci-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/ohci-octeon.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/usb/host/ohci-octeon.c b/drivers/usb/host/ohci-octeon.c
index 15af8954085e..20d861b6192f 100644
--- a/drivers/usb/host/ohci-octeon.c
+++ b/drivers/usb/host/ohci-octeon.c
@@ -120,12 +120,6 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev)
120 return -ENODEV; 120 return -ENODEV;
121 } 121 }
122 122
123 res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
124 if (res_mem == NULL) {
125 dev_err(&pdev->dev, "No register space assigned\n");
126 return -ENODEV;
127 }
128
129 /* Ohci is a 32-bit device. */ 123 /* Ohci is a 32-bit device. */
130 ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); 124 ret = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
131 if (ret) 125 if (ret)
@@ -135,14 +129,14 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev)
135 if (!hcd) 129 if (!hcd)
136 return -ENOMEM; 130 return -ENOMEM;
137 131
138 hcd->rsrc_start = res_mem->start; 132 res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
139 hcd->rsrc_len = resource_size(res_mem);
140
141 reg_base = devm_ioremap_resource(&pdev->dev, res_mem); 133 reg_base = devm_ioremap_resource(&pdev->dev, res_mem);
142 if (IS_ERR(reg_base)) { 134 if (IS_ERR(reg_base)) {
143 ret = PTR_ERR(reg_base); 135 ret = PTR_ERR(reg_base);
144 goto err1; 136 goto err1;
145 } 137 }
138 hcd->rsrc_start = res_mem->start;
139 hcd->rsrc_len = resource_size(res_mem);
146 140
147 ohci_octeon_hw_start(); 141 ohci_octeon_hw_start();
148 142