]> Pileus Git - ~andy/linux/commitdiff
ata: pata_samsung_cf: Use devm_ioremap_resource()
authorJingoo Han <jg1.han@samsung.com>
Thu, 2 Jan 2014 08:24:03 +0000 (17:24 +0900)
committerTejun Heo <tj@kernel.org>
Thu, 2 Jan 2014 12:48:33 +0000 (07:48 -0500)
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().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
drivers/ata/pata_samsung_cf.c

index cd2746b169a987fae870797a5c7fa63ca29b3720..7d2142fbcbb77c122776678969cc2d86ce71d14f 100644 (file)
@@ -531,22 +531,10 @@ static int __init pata_s3c_probe(struct platform_device *pdev)
        info->irq = platform_get_irq(pdev, 0);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res == NULL) {
-               dev_err(dev, "failed to get mem resource\n");
-               return -EINVAL;
-       }
-
-       if (!devm_request_mem_region(dev, res->start,
-                               resource_size(res), DRV_NAME)) {
-               dev_err(dev, "error requesting register region\n");
-               return -EBUSY;
-       }
 
-       info->ide_addr = devm_ioremap(dev, res->start, resource_size(res));
-       if (!info->ide_addr) {
-               dev_err(dev, "failed to map IO base address\n");
-               return -ENOMEM;
-       }
+       info->ide_addr = devm_ioremap_resource(dev, res);
+       if (IS_ERR(info->ide_addr))
+               return PTR_ERR(info->ide_addr);
 
        info->clk = devm_clk_get(&pdev->dev, "cfcon");
        if (IS_ERR(info->clk)) {