From: Sakari Ailus Date: Mon, 16 Feb 2015 10:45:01 +0000 (-0300) Subject: [media] Revert "[media] smiapp: Don't compile of_read_number() if CONFIG_OF isn't... X-Git-Tag: firefly_0821_release~176^2~795^2~1251 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=152635c6eadf41931892cccaac5fe8b627d9951b;p=firefly-linux-kernel-4.4.55.git [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 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 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) struct property *prop; __be32 *val; uint32_t asize; -#ifdef CONFIG_OF unsigned int i; -#endif int rval; if (!dev->of_node) @@ -3059,10 +3057,8 @@ 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,