Skip to contentSkip to conversation

hwrng: n2: Use device_get_match_data()

PATCH In review Rob Herring 2 participants 2 messages Oct 6, 2023 – Oct 13, 2023

Subsystems (2)
Crypto API Hardware random number generator core
lore
Share & tools
lore

Rob Herring

author
#0 lore raw

PATCH 1/1 hwrng: n2: Use device_get_match_data()

Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers.

Signed-off-by Rob Herring <[email protected]>
---
 drivers/char/hw_random/n2-drv.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/char/hw_random/n2-drv.c +3 -7
index 73e408146420..aaae16b98475 100644
@@ -14,7 +14,8 @@
 #include <linux/hw_random.h>
 
 #include <linux/of.h>
-#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/property.h>
 
 #include <asm/hypervisor.h>
 

@@ -695,20 +696,15 @@ static void n2rng_driver_version(void)
 static const struct of_device_id n2rng_match[];
 static int n2rng_probe(struct platform_device *op)
 {
-	const struct of_device_id *match;
 	int err = -ENOMEM;
 	struct n2rng *np;
 
-	match = of_match_device(n2rng_match, &op->dev);
-	if (!match)
-		return -EINVAL;
-
 	n2rng_driver_version();
 	np = devm_kzalloc(&op->dev, sizeof(*np), GFP_KERNEL);
 	if (!np)
 		goto out;
 	np->op = op;
-	np->data = (struct n2rng_template *)match->data;
+	np->data = (struct n2rng_template *)device_get_match_data(&op->dev);
 
 	INIT_DELAYED_WORK(&np->work, n2rng_work);
Signature · 1 line
2.40.1
maintainer
#1 lore raw
Quoted 8 lines · Rob Herring

Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers.

Signed-off-by Rob Herring <[email protected]>
---
 drivers/char/hw_random/n2-drv.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Patch applied. Thanks.

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