aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2014-11-30 10:33:55 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-04-02 16:26:30 -0400
commit3f39fb0f1e52617fc502d989cac72dd3779fccd4 (patch)
treee548a7bca9953e7865851d3cd6b5b24192025cec /drivers/media/i2c
parent152635c6eadf41931892cccaac5fe8b627d9951b (diff)
[media] smiapp: Use of_property_read_u64_array() to read a 64-bit number array
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>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/smiapp/smiapp-core.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index f1eb259ce618..6de10f94cff7 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2977,10 +2977,7 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev)
2977 struct smiapp_platform_data *pdata; 2977 struct smiapp_platform_data *pdata;
2978 struct v4l2_of_endpoint bus_cfg; 2978 struct v4l2_of_endpoint bus_cfg;
2979 struct device_node *ep; 2979 struct device_node *ep;
2980 struct property *prop;
2981 __be32 *val;
2982 uint32_t asize; 2980 uint32_t asize;
2983 unsigned int i;
2984 int rval; 2981 int rval;
2985 2982
2986 if (!dev->of_node) 2983 if (!dev->of_node)
@@ -3042,23 +3039,12 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev)
3042 } 3039 }
3043 3040
3044 asize /= sizeof(*pdata->op_sys_clock); 3041 asize /= sizeof(*pdata->op_sys_clock);
3045 /* 3042 rval = of_property_read_u64_array(
3046 * Read a 64-bit array --- this will be replaced with a 3043 dev->of_node, "link-frequencies", pdata->op_sys_clock, asize);
3047 * of_property_read_u64_array() once it's merged. 3044 if (rval) {
3048 */ 3045 dev_warn(dev, "can't get link-frequencies\n");
3049 prop = of_find_property(dev->of_node, "link-frequencies", NULL);
3050 if (!prop)
3051 goto out_err;
3052 if (!prop->value)
3053 goto out_err;
3054 if (asize * sizeof(*pdata->op_sys_clock) > prop->length)
3055 goto out_err;
3056 val = prop->value;
3057 if (IS_ERR(val))
3058 goto out_err; 3046 goto out_err;
3059 3047 }
3060 for (i = 0; i < asize; i++)
3061 pdata->op_sys_clock[i] = of_read_number(val + i * 2, 2);
3062 3048
3063 for (; asize > 0; asize--) 3049 for (; asize > 0; asize--)
3064 dev_dbg(dev, "freq %d: %lld\n", asize - 1, 3050 dev_dbg(dev, "freq %d: %lld\n", asize - 1,