]> rtime.felk.cvut.cz Git - vajnamar/linux-xlnx.git/commitdiff
[media] smiapp: Use of_property_read_u64_array() to read a 64-bit number array
authorSakari Ailus <sakari.ailus@iki.fi>
Sun, 30 Nov 2014 15:33:55 +0000 (12:33 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 2 Apr 2015 20:26:30 +0000 (17:26 -0300)
of_property_read_u64_array() wasn't yet part of the kernel tree when the
functionality was needed. Do use it now.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/i2c/smiapp/smiapp-core.c

index f1eb259ce6186c80967cda1c8906cc25cd74b8fc..6de10f94cff799c9a5f10e738b24e26de50bbbd6 100644 (file)
@@ -2977,10 +2977,7 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev)
        struct smiapp_platform_data *pdata;
        struct v4l2_of_endpoint bus_cfg;
        struct device_node *ep;
-       struct property *prop;
-       __be32 *val;
        uint32_t asize;
-       unsigned int i;
        int rval;
 
        if (!dev->of_node)
@@ -3042,23 +3039,12 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev)
        }
 
        asize /= sizeof(*pdata->op_sys_clock);
-       /*
-        * Read a 64-bit array --- this will be replaced with a
-        * of_property_read_u64_array() once it's merged.
-        */
-       prop = of_find_property(dev->of_node, "link-frequencies", NULL);
-       if (!prop)
-               goto out_err;
-       if (!prop->value)
-               goto out_err;
-       if (asize * sizeof(*pdata->op_sys_clock) > prop->length)
-               goto out_err;
-       val = prop->value;
-       if (IS_ERR(val))
+       rval = of_property_read_u64_array(
+               dev->of_node, "link-frequencies", pdata->op_sys_clock, asize);
+       if (rval) {
+               dev_warn(dev, "can't get link-frequencies\n");
                goto out_err;
-
-       for (i = 0; i < asize; i++)
-               pdata->op_sys_clock[i] = of_read_number(val + i * 2, 2);
+       }
 
        for (; asize > 0; asize--)
                dev_dbg(dev, "freq %d: %lld\n", asize - 1,