fbdev: omapfb: Use syscon_regmap_lookup_by_phandle_args

Use syscon_regmap_lookup_by_phandle_args() which is a wrapper over
syscon_regmap_lookup_by_phandle() combined with getting the syscon
argument.  Except simpler code this annotates within one line that given
phandle has arguments, so grepping for code would be easier.

There is also no real benefit in printing errors on missing syscon
argument, because this is done just too late: runtime check on
static/build-time data.  Dtschema and Devicetree bindings offer the
static/build-time check for this already.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
index 7010544e02e158ab64672fc7b926a6cd353ceb87..ccb96a5be07e46749687e92690e84ab5e13baf3f 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
@@ -3934,17 +3934,12 @@ static int dispc_bind(struct device *dev, struct device *master, void *data)
        }
 
        if (np && of_property_present(np, "syscon-pol")) {
-               dispc.syscon_pol = syscon_regmap_lookup_by_phandle(np, "syscon-pol");
+               dispc.syscon_pol = syscon_regmap_lookup_by_phandle_args(np, "syscon-pol",
+                                                                       1, &dispc.syscon_pol_offset);
                if (IS_ERR(dispc.syscon_pol)) {
                        dev_err(&pdev->dev, "failed to get syscon-pol regmap\n");
                        return PTR_ERR(dispc.syscon_pol);
                }
-
-               if (of_property_read_u32_index(np, "syscon-pol", 1,
-                               &dispc.syscon_pol_offset)) {
-                       dev_err(&pdev->dev, "failed to get syscon-pol offset\n");
-                       return -EINVAL;
-               }
        }
 
        pm_runtime_enable(&pdev->dev);