2016-02-21 09:53:35

by Álvaro Fernández Rojas

Subject: [PATCH] hw_random: brcm63xx-rng: fix non device tree compatibility

Allow building when OF is not enabled as suggested by Florian

Signed-off-by: Álvaro Fernández Rojas <[email protected]>
Reported-by: Florian Fainelli <[email protected]>
---
drivers/char/hw_random/bcm63xx-rng.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/char/hw_random/bcm63xx-rng.c b/drivers/char/hw_random/bcm63xx-rng.c
index 38553f0..ca9c403 100644
--- a/drivers/char/hw_random/bcm63xx-rng.c
+++ b/drivers/char/hw_random/bcm63xx-rng.c
@@ -130,17 +130,19 @@ static int bcm63xx_rng_probe(struct platform_device *pdev)
return 0;
}

+#ifdef CONFIG_OF
static const struct of_device_id bcm63xx_rng_of_match[] = {
{ .compatible = "brcm,bcm6368-rng", },
{},
};
MODULE_DEVICE_TABLE(of, bcm63xx_rng_of_match);
+#endif

static struct platform_driver bcm63xx_rng_driver = {
.probe = bcm63xx_rng_probe,
.driver = {
.name = "bcm63xx-rng",
- .of_match_table = bcm63xx_rng_of_match,
+ .of_match_table = of_match_ptr(bcm63xx_rng_of_match),
},
};

--
1.9.1

2016-02-27 19:34:55

by Herbert Xu

Subject: Re: [PATCH] hw_random: brcm63xx-rng: fix non device tree compatibility

On Sun, Feb 21, 2016 at 10:53:35AM +0100, ?lvaro Fern?ndez Rojas wrote:
> Allow building when OF is not enabled as suggested by Florian
>
> Signed-off-by: ?lvaro Fern?ndez Rojas <[email protected]>
> Reported-by: Florian Fainelli <[email protected]>

Applied.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt