crypto: ccree - use of_device_get_match_data()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Tue, 11 Feb 2020 18:19:09 +0000 (19:19 +0100)
committerHerbert Xu <herbert@gondor.apana.org.au>
Sat, 22 Feb 2020 01:25:44 +0000 (09:25 +0800)
If the driver is probed, it means a match was found in
arm_ccree_dev_of_match[].  Hence we can just use the
of_device_get_match_data() helper.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/ccree/cc_driver.c

index c7e44f2..e365ede 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/of.h>
 #include <linux/clk.h>
 #include <linux/of_address.h>
+#include <linux/of_device.h>
 #include <linux/pm_runtime.h>
 
 #include "cc_driver.h"
@@ -270,7 +271,6 @@ static int init_cc_resources(struct platform_device *plat_dev)
        u32 val, hw_rev_pidr, sig_cidr;
        u64 dma_mask;
        const struct cc_hw_data *hw_rev;
-       const struct of_device_id *dev_id;
        struct clk *clk;
        int irq;
        int rc = 0;
@@ -279,11 +279,7 @@ static int init_cc_resources(struct platform_device *plat_dev)
        if (!new_drvdata)
                return -ENOMEM;
 
-       dev_id = of_match_node(arm_ccree_dev_of_match, np);
-       if (!dev_id)
-               return -ENODEV;
-
-       hw_rev = (struct cc_hw_data *)dev_id->data;
+       hw_rev = of_device_get_match_data(dev);
        new_drvdata->hw_rev_name = hw_rev->name;
        new_drvdata->hw_rev = hw_rev->rev;
        new_drvdata->std_bodies = hw_rev->std_bodies;