aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ata/pata_samsung_cf.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c
index cd2746b169a9..7d2142fbcbb7 100644
--- a/drivers/ata/pata_samsung_cf.c
+++ b/drivers/ata/pata_samsung_cf.c
@@ -531,22 +531,10 @@ static int __init pata_s3c_probe(struct platform_device *pdev)
531 info->irq = platform_get_irq(pdev, 0); 531 info->irq = platform_get_irq(pdev, 0);
532 532
533 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 533 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
534 if (res == NULL) {
535 dev_err(dev, "failed to get mem resource\n");
536 return -EINVAL;
537 }
538
539 if (!devm_request_mem_region(dev, res->start,
540 resource_size(res), DRV_NAME)) {
541 dev_err(dev, "error requesting register region\n");
542 return -EBUSY;
543 }
544 534
545 info->ide_addr = devm_ioremap(dev, res->start, resource_size(res)); 535 info->ide_addr = devm_ioremap_resource(dev, res);
546 if (!info->ide_addr) { 536 if (IS_ERR(info->ide_addr))
547 dev_err(dev, "failed to map IO base address\n"); 537 return PTR_ERR(info->ide_addr);
548 return -ENOMEM;
549 }
550 538
551 info->clk = devm_clk_get(&pdev->dev, "cfcon"); 539 info->clk = devm_clk_get(&pdev->dev, "cfcon");
552 if (IS_ERR(info->clk)) { 540 if (IS_ERR(info->clk)) {