Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 01:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtd: denali_dt: Use devm_ioremap_resource()

Browse Source 
Use devm_ioremap_resource() in order to make the code
simpler, and remove redundant return value check of
platform_get_resource_byname() because the value is
checked by devm_ioremap_resource().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Tested-by: Dinh Nguyen <dinguyen@altera.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Jingoo Han 2014-02-12 11:29:42 +09:00 committed by Brian Norris
parent c7ea95a377
commit 7995204e3c
1 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/mtd/nand/denali_dt.c
View File

@ -30,24 +30,6 @@ struct denali_dt {
struct clk *clk; struct clk *clk;
}; };
static void __iomem *request_and_map(struct device *dev,
const struct resource *res)
{
void __iomem *ptr;
if (!devm_request_mem_region(dev, res->start, resource_size(res),
"denali-dt")) {
dev_err(dev, "unable to request %s\n", res->name);
return NULL;
}
ptr = devm_ioremap_nocache(dev, res->start, resource_size(res));
if (!ptr)
dev_err(dev, "ioremap_nocache of %s failed!", res->name);
return ptr;
}
static const struct of_device_id denali_nand_dt_ids[] = { static const struct of_device_id denali_nand_dt_ids[] = {
{ .compatible = "denali,denali-nand-dt" }, { .compatible = "denali,denali-nand-dt" },
{ /* sentinel */ } { /* sentinel */ }
@ -78,13 +60,6 @@ static int denali_dt_probe(struct platform_device *ofdev)
return -ENOMEM; return -ENOMEM;
denali = &dt->denali; denali = &dt->denali;
denali_reg = platform_get_resource_byname(ofdev, IORESOURCE_MEM, "denali_reg");
nand_data = platform_get_resource_byname(ofdev, IORESOURCE_MEM, "nand_data");
if (!denali_reg || !nand_data) {
dev_err(&ofdev->dev, "resources not completely defined\n");
return -EINVAL;
}
denali->platform = DT; denali->platform = DT;
denali->dev = &ofdev->dev; denali->dev = &ofdev->dev;
denali->irq = platform_get_irq(ofdev, 0); denali->irq = platform_get_irq(ofdev, 0);
@ -93,13 +68,15 @@ static int denali_dt_probe(struct platform_device *ofdev)
return denali->irq; return denali->irq;
} }
denali->flash_reg = request_and_map(&ofdev->dev, denali_reg); denali_reg = platform_get_resource_byname(ofdev, IORESOURCE_MEM, "denali_reg");
if (!denali->flash_reg) denali->flash_reg = devm_ioremap_resource(&ofdev->dev, denali_reg);
return -ENOMEM; if (IS_ERR(denali->flash_reg))
return PTR_ERR(denali->flash_reg);
denali->flash_mem = request_and_map(&ofdev->dev, nand_data); nand_data = platform_get_resource_byname(ofdev, IORESOURCE_MEM, "nand_data");
if (!denali->flash_mem) denali->flash_mem = devm_ioremap_resource(&ofdev->dev, nand_data);
return -ENOMEM; if (IS_ERR(denali->flash_mem))
return PTR_ERR(denali->flash_mem);
if (!of_property_read_u32(ofdev->dev.of_node, if (!of_property_read_u32(ofdev->dev.of_node,
"dma-mask", (u32 *)&denali_dma_mask)) { "dma-mask", (u32 *)&denali_dma_mask)) {