@@ -725,45 +725,26 @@ static int ti_abb_probe(struct platform_device *pdev)
725
725
726
726
/* Map ABB resources */
727
727
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" );
731
729
if (IS_ERR (abb -> base ))
732
730
return PTR_ERR (abb -> base );
733
731
734
732
abb -> setup_reg = abb -> base + abb -> regs -> setup_off ;
735
733
abb -> control_reg = abb -> base + abb -> regs -> control_off ;
736
734
737
735
} 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" );
741
737
if (IS_ERR (abb -> control_reg ))
742
738
return PTR_ERR (abb -> control_reg );
743
739
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" );
747
741
if (IS_ERR (abb -> setup_reg ))
748
742
return PTR_ERR (abb -> setup_reg );
749
743
}
750
744
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 );
767
748
768
749
/* Map Optional resources */
769
750
pname = "efuse-address" ;
0 commit comments