diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2014-02-12 11:34:37 +0900 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-03-25 23:21:15 -0700 |
| commit | 00d09891eb947f8c4a7cb4d16bf3de305a65de77 (patch) | |
| tree | b4e5553a9979481d00a61c7c437279709eb5312c /drivers/mtd | |
| parent | 7995204e3c89820c4621af90b0e5f9ca0b375471 (diff) | |
| download | op-kernel-dev-00d09891eb947f8c4a7cb4d16bf3de305a65de77.zip op-kernel-dev-00d09891eb947f8c4a7cb4d16bf3de305a65de77.tar.gz | |
mtd: omap2: Use devm_ioremap_resource()
Use devm_ioremap_resource() in order to make the code simpler,
and remove redundant return value check of platform_get_resource()
because the value is checked by devm_ioremap_resource(). Also,
'unsigned long mem_size' is removed from 'struct omap_nand_info',
because the 'mem_size' variable is not necessary anymore.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 6f9b339..1ff49b8 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -154,7 +154,6 @@ struct omap_nand_info { int gpmc_cs; unsigned long phys_base; - unsigned long mem_size; enum omap_ecc ecc_opt; struct completion comp; struct dma_chan *dma; @@ -1607,27 +1606,11 @@ static int omap_nand_probe(struct platform_device *pdev) nand_chip->options |= NAND_SKIP_BBTSCAN; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (res == NULL) { - err = -EINVAL; - dev_err(&pdev->dev, "error getting memory resource\n"); - goto return_error; - } + nand_chip->IO_ADDR_R = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(nand_chip->IO_ADDR_R)) + return PTR_ERR(nand_chip->IO_ADDR_R); info->phys_base = res->start; - info->mem_size = resource_size(res); - - if (!devm_request_mem_region(&pdev->dev, info->phys_base, - info->mem_size, pdev->dev.driver->name)) { - err = -EBUSY; - goto return_error; - } - - nand_chip->IO_ADDR_R = devm_ioremap(&pdev->dev, info->phys_base, - info->mem_size); - if (!nand_chip->IO_ADDR_R) { - err = -ENOMEM; - goto return_error; - } nand_chip->controller = &info->controller; |
