aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2015-02-16 05:45:01 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-04-02 16:10:43 -0400
commit152635c6eadf41931892cccaac5fe8b627d9951b (patch)
tree70a39e549fb08449ce29a623efbd0a86cd995f57 /drivers/media/i2c
parent6c9fe765360efa97c63b89af685b620baf5e0012 (diff)
[media] Revert "[media] smiapp: Don't compile of_read_number() if CONFIG_OF isn't defined"
This reverts commit cb88d7384e5e05f90c1daa7750bdb467fd026261. 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.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index c73deb0432d7..f1eb259ce618 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2980,9 +2980,7 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev)
2980 struct property *prop; 2980 struct property *prop;
2981 __be32 *val; 2981 __be32 *val;
2982 uint32_t asize; 2982 uint32_t asize;
2983#ifdef CONFIG_OF
2984 unsigned int i; 2983 unsigned int i;
2985#endif
2986 int rval; 2984 int rval;
2987 2985
2988 if (!dev->of_node) 2986 if (!dev->of_node)
@@ -3059,10 +3057,8 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev)
3059 if (IS_ERR(val)) 3057 if (IS_ERR(val))
3060 goto out_err; 3058 goto out_err;
3061 3059
3062#ifdef CONFIG_OF
3063 for (i = 0; i < asize; i++) 3060 for (i = 0; i < asize; i++)
3064 pdata->op_sys_clock[i] = of_read_number(val + i * 2, 2); 3061 pdata->op_sys_clock[i] = of_read_number(val + i * 2, 2);
3065#endif
3066 3062
3067 for (; asize > 0; asize--) 3063 for (; asize > 0; asize--)
3068 dev_dbg(dev, "freq %d: %lld\n", asize - 1, 3064 dev_dbg(dev, "freq %d: %lld\n", asize - 1,