OSDN Git Service

[media] Revert "[media] smiapp: Don't compile of_read_number() if CONFIG_OF isn't...
authorSakari Ailus <sakari.ailus@iki.fi>
Mon, 16 Feb 2015 10:45:01 +0000 (07:45 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 2 Apr 2015 20:10:43 +0000 (17:10 -0300)
This reverts commit cb88d7384e5e05f90c1daa7750bdb467fd026261.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/i2c/smiapp/smiapp-core.c

index c73deb0..f1eb259 100644 (file)
@@ -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,