Skip to content

Commit fa0f667

Browse files
nehebfloatious
authored andcommitted
ata: pata_arasan_cf: simplify ioremap
Use devm_platform_get_and_ioremap_resource() to combine platform_get_resource, request_mem_region, and ioremap. Signed-off-by: Rosen Penev <rosenp@gmail.com> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Signed-off-by: Niklas Cassel <cassel@kernel.org>
1 parent 28afe01 commit fa0f667

1 file changed

Lines changed: 6 additions & 18 deletions

File tree

drivers/ata/pata_arasan_cf.c

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -803,16 +803,6 @@ static int arasan_cf_probe(struct platform_device *pdev)
803803
irq_handler_t irq_handler = NULL;
804804
int ret;
805805

806-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
807-
if (!res)
808-
return -EINVAL;
809-
810-
if (!devm_request_mem_region(&pdev->dev, res->start, resource_size(res),
811-
DRIVER_NAME)) {
812-
dev_warn(&pdev->dev, "Failed to get memory region resource\n");
813-
return -ENOENT;
814-
}
815-
816806
acdev = devm_kzalloc(&pdev->dev, sizeof(*acdev), GFP_KERNEL);
817807
if (!acdev)
818808
return -ENOMEM;
@@ -827,22 +817,20 @@ static int arasan_cf_probe(struct platform_device *pdev)
827817
* support only PIO
828818
*/
829819
ret = platform_get_irq(pdev, 0);
820+
if (ret == -EPROBE_DEFER)
821+
return ret;
830822
if (ret > 0) {
831823
acdev->irq = ret;
832824
irq_handler = arasan_cf_interrupt;
833-
} else if (ret == -EPROBE_DEFER) {
834-
return ret;
835825
} else {
836826
quirk |= CF_BROKEN_MWDMA | CF_BROKEN_UDMA;
837827
}
838828

829+
acdev->vbase = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
830+
if (IS_ERR(acdev->vbase))
831+
return PTR_ERR(acdev->vbase);
832+
839833
acdev->pbase = res->start;
840-
acdev->vbase = devm_ioremap(&pdev->dev, res->start,
841-
resource_size(res));
842-
if (!acdev->vbase) {
843-
dev_warn(&pdev->dev, "ioremap fail\n");
844-
return -ENOMEM;
845-
}
846834

847835
acdev->clk = devm_clk_get(&pdev->dev, NULL);
848836
if (IS_ERR(acdev->clk)) {

0 commit comments

Comments
 (0)