From: Sakari Ailus Date: Tue, 27 Jan 2015 10:18:49 +0000 (-0300) Subject: [media] smiapp: Don't compile of_read_number() if CONFIG_OF isn't defined X-Git-Tag: v4.0-rc1~130^2~187 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cb88d7384e5e05f90c1daa7750bdb467fd026261;p=karo-tx-linux.git [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 Signed-off-by: Mauro Carvalho Chehab --- 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) struct property *prop; __be32 *val; uint32_t asize; +#ifdef CONFIG_OF unsigned int i; +#endif int rval; if (!dev->of_node) @@ -3057,8 +3059,10 @@ static struct smiapp_platform_data *smiapp_get_pdata(struct device *dev) if (IS_ERR(val)) goto out_err; +#ifdef CONFIG_OF for (i = 0; i < asize; i++) pdata->op_sys_clock[i] = of_read_number(val + i * 2, 2); +#endif for (; asize > 0; asize--) dev_dbg(dev, "freq %d: %lld\n", asize - 1,