luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwrng: omap - Fix W=1 unused variable warning

Browse Source 
This patch fixes an unused variable warning when this driver is
built-in with CONFIG_OF=n.  While we're at it this patch also
expands the compiler coverage when CONFIG_OF is off by removing
all the CONFIG_OF ifdefs.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2020-06-29 18:03:55 +10:00
parent 9a150af05f
commit 414a3c1b81
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/char/hw_random/omap-rng.c
View File

@ -22,6 +22,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/hw_random.h> #include <linux/hw_random.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/of.h> #include <linux/of.h>
@ -243,7 +244,6 @@ static struct omap_rng_pdata omap2_rng_pdata = {
.cleanup = omap2_rng_cleanup, .cleanup = omap2_rng_cleanup,
}; };
#if defined(CONFIG_OF)
static inline u32 omap4_rng_data_present(struct omap_rng_dev *priv) static inline u32 omap4_rng_data_present(struct omap_rng_dev *priv)
{ {
return omap_rng_read(priv, RNG_STATUS_REG) & RNG_REG_STATUS_RDY; return omap_rng_read(priv, RNG_STATUS_REG) & RNG_REG_STATUS_RDY;
@ -358,7 +358,7 @@ static struct omap_rng_pdata eip76_rng_pdata = {
.cleanup = omap4_rng_cleanup, .cleanup = omap4_rng_cleanup,
}; };
static const struct of_device_id omap_rng_of_match[] = { static const struct of_device_id omap_rng_of_match[] __maybe_unused = {
{ {
.compatible = "ti,omap2-rng", .compatible = "ti,omap2-rng",
.data = &omap2_rng_pdata, .data = &omap2_rng_pdata,
@ -418,13 +418,6 @@ static int of_get_omap_rng_device_details(struct omap_rng_dev *priv,
} }
return 0; return 0;
} }
#else
static int of_get_omap_rng_device_details(struct omap_rng_dev *omap_rng,
struct platform_device *pdev)
{
return -EINVAL;
}
#endif
static int get_omap_rng_device_details(struct omap_rng_dev *omap_rng) static int get_omap_rng_device_details(struct omap_rng_dev *omap_rng)
{ {