Skip to content

Commit b36c6b1

Browse files
caihuoqing1990broonie
authored andcommitted
regulator: ti-abb: Make use of the helper function devm_ioremap related
Use the devm_platform_ioremap_resource_byname() helper instead of calling platform_get_resource_byname() and devm_ioremap/devm_ioremap_resource() separately Signed-off-by: Cai Huoqing <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent c33e65c commit b36c6b1

File tree

1 file changed

+6
-25
lines changed

1 file changed

+6
-25
lines changed

drivers/regulator/ti-abb-regulator.c

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -725,45 +725,26 @@ static int ti_abb_probe(struct platform_device *pdev)
725725

726726
/* Map ABB resources */
727727
if (abb->regs->setup_off || abb->regs->control_off) {
728-
pname = "base-address";
729-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
730-
abb->base = devm_ioremap_resource(dev, res);
728+
abb->base = devm_platform_ioremap_resource_byname(pdev, "base-address");
731729
if (IS_ERR(abb->base))
732730
return PTR_ERR(abb->base);
733731

734732
abb->setup_reg = abb->base + abb->regs->setup_off;
735733
abb->control_reg = abb->base + abb->regs->control_off;
736734

737735
} else {
738-
pname = "control-address";
739-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
740-
abb->control_reg = devm_ioremap_resource(dev, res);
736+
abb->control_reg = devm_platform_ioremap_resource_byname(pdev, "control-address");
741737
if (IS_ERR(abb->control_reg))
742738
return PTR_ERR(abb->control_reg);
743739

744-
pname = "setup-address";
745-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
746-
abb->setup_reg = devm_ioremap_resource(dev, res);
740+
abb->setup_reg = devm_platform_ioremap_resource_byname(pdev, "setup-address");
747741
if (IS_ERR(abb->setup_reg))
748742
return PTR_ERR(abb->setup_reg);
749743
}
750744

751-
pname = "int-address";
752-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, pname);
753-
if (!res) {
754-
dev_err(dev, "Missing '%s' IO resource\n", pname);
755-
return -ENODEV;
756-
}
757-
/*
758-
* We may have shared interrupt register offsets which are
759-
* write-1-to-clear between domains ensuring exclusivity.
760-
*/
761-
abb->int_base = devm_ioremap(dev, res->start,
762-
resource_size(res));
763-
if (!abb->int_base) {
764-
dev_err(dev, "Unable to map '%s'\n", pname);
765-
return -ENOMEM;
766-
}
745+
abb->int_base = devm_platform_ioremap_resource_byname(pdev, "int-address");
746+
if (IS_ERR(abb->int_base))
747+
return PTR_ERR(abb->int_base);
767748

768749
/* Map Optional resources */
769750
pname = "efuse-address";

0 commit comments

Comments
 (0)