diff options
author | Sanjeev Sharma <sanjeev_sharma@mentor.com> | 2015-10-29 06:04:55 -0400 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2015-10-30 11:10:40 -0400 |
commit | 16bd5865cdb3b190105db21bd22a0ca0501e7b20 (patch) | |
tree | 6b207e90f26402a3f705eb8079ce3b3b92c5770e | |
parent | d2c85ac24ed7636934f469fac8836b87c7e6cb40 (diff) |
hsi: controllers:remove redundant code
Use devm_ioremap_resource() in order to make the code simpler,
and remove redundant return value check of platform_get_resource()
because this value is alreadytaken care by devm_ioremap_resource()
Signed-off-by: Sanjeev Sharma <sanjeev_sharma@mentor.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
-rw-r--r-- | drivers/hsi/controllers/omap_ssi.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/drivers/hsi/controllers/omap_ssi.c b/drivers/hsi/controllers/omap_ssi.c index 089c6c3feb3e..f6d3100b7a32 100644 --- a/drivers/hsi/controllers/omap_ssi.c +++ b/drivers/hsi/controllers/omap_ssi.c | |||
@@ -295,27 +295,14 @@ static int __init ssi_get_iomem(struct platform_device *pd, | |||
295 | const char *name, void __iomem **pbase, dma_addr_t *phy) | 295 | const char *name, void __iomem **pbase, dma_addr_t *phy) |
296 | { | 296 | { |
297 | struct resource *mem; | 297 | struct resource *mem; |
298 | struct resource *ioarea; | ||
299 | void __iomem *base; | 298 | void __iomem *base; |
300 | struct hsi_controller *ssi = platform_get_drvdata(pd); | 299 | struct hsi_controller *ssi = platform_get_drvdata(pd); |
301 | 300 | ||
302 | mem = platform_get_resource_byname(pd, IORESOURCE_MEM, name); | 301 | mem = platform_get_resource_byname(pd, IORESOURCE_MEM, name); |
303 | if (!mem) { | 302 | base = devm_ioremap_resource(&ssi->device, mem); |
304 | dev_err(&pd->dev, "IO memory region missing (%s)\n", name); | 303 | if (IS_ERR(base)) |
305 | return -ENXIO; | 304 | return PTR_ERR(base); |
306 | } | 305 | |
307 | ioarea = devm_request_mem_region(&ssi->device, mem->start, | ||
308 | resource_size(mem), dev_name(&pd->dev)); | ||
309 | if (!ioarea) { | ||
310 | dev_err(&pd->dev, "%s IO memory region request failed\n", | ||
311 | mem->name); | ||
312 | return -ENXIO; | ||
313 | } | ||
314 | base = devm_ioremap(&ssi->device, mem->start, resource_size(mem)); | ||
315 | if (!base) { | ||
316 | dev_err(&pd->dev, "%s IO remap failed\n", mem->name); | ||
317 | return -ENXIO; | ||
318 | } | ||
319 | *pbase = base; | 306 | *pbase = base; |
320 | 307 | ||
321 | if (phy) | 308 | if (phy) |