diff options
author | Sakari Ailus <sakari.ailus@iki.fi> | 2015-01-27 05:18:49 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-29 14:59:22 -0500 |
commit | cb88d7384e5e05f90c1daa7750bdb467fd026261 (patch) | |
tree | 22bf48a86ede61538e5a58d32333313027305451 /drivers/media/i2c | |
parent | 8d44aeefcd79e9be3b6db4f37efc7544995b619e (diff) |
[media] smiapp: Don't compile of_read_number() if CONFIG_OF isn't defined
of_read_number() is defined in of.h but does not return an error code, so
that non-of implementation could simply return an error.
Temporarily work around this until of_read_number() can be replaced by
of_property_read_u64_array().
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.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c index b3c81257e08d..d47eff5d3101 100644 --- a/drivers/media/i2c/smiapp/smiapp-core.c +++ b/drivers/media/i2c/smiapp/smiapp-core.c | |||
@@ -2980,7 +2980,9 @@ 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 | ||
2983 | unsigned int i; | 2984 | unsigned int i; |
2985 | #endif | ||
2984 | int rval; | 2986 | int rval; |
2985 | 2987 | ||
2986 | if (!dev->of_node) | 2988 | if (!dev->of_node) |
@@ -3057,8 +3059,10 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev) | |||
3057 | if (IS_ERR(val)) | 3059 | if (IS_ERR(val)) |
3058 | goto out_err; | 3060 | goto out_err; |
3059 | 3061 | ||
3062 | #ifdef CONFIG_OF | ||
3060 | for (i = 0; i < asize; i++) | 3063 | for (i = 0; i < asize; i++) |
3061 | pdata->op_sys_clock[i] = of_read_number(val + i * 2, 2); | 3064 | pdata->op_sys_clock[i] = of_read_number(val + i * 2, 2); |
3065 | #endif | ||
3062 | 3066 | ||
3063 | for (; asize > 0; asize--) | 3067 | for (; asize > 0; asize--) |
3064 | dev_dbg(dev, "freq %d: %lld\n", asize - 1, | 3068 | dev_dbg(dev, "freq %d: %lld\n", asize - 1, |