crypto: aspeed-hace - 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 <robh@kernel.org>
Reviewed-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Reviewed-by: Neal Liu <neal_liu@aspeedtech.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/aspeed/aspeed-hace.c b/drivers/crypto/aspeed/aspeed-hace.c
index 8f7aab82e1d82c8834c7881f12d762526c071b1d..d9da04fb816e949e50e82ce7c04c9150a45c761b 100644 (file)
--- a/drivers/crypto/aspeed/aspeed-hace.c
+++ b/drivers/crypto/aspeed/aspeed-hace.c
@@ -12,11 +12,9 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/of_address.h>
-#include <linux/of_device.h>
-#include <linux/of_irq.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 
 #ifdef CONFIG_CRYPTO_DEV_ASPEED_DEBUG
 #define HACE_DBG(d, fmt, ...)  \
@@ -101,7 +99,6 @@ static const struct of_device_id aspeed_hace_of_matches[] = {
 static int aspeed_hace_probe(struct platform_device *pdev)
 {
        struct aspeed_engine_crypto *crypto_engine;
-       const struct of_device_id *hace_dev_id;
        struct aspeed_engine_hash *hash_engine;
        struct aspeed_hace_dev *hace_dev;
        int rc;
@@ -111,14 +108,13 @@ static int aspeed_hace_probe(struct platform_device *pdev)
        if (!hace_dev)
                return -ENOMEM;
 
-       hace_dev_id = of_match_device(aspeed_hace_of_matches, &pdev->dev);
-       if (!hace_dev_id) {
+       hace_dev->version = (uintptr_t)device_get_match_data(&pdev->dev);
+       if (!hace_dev->version) {
                dev_err(&pdev->dev, "Failed to match hace dev id\n");
                return -EINVAL;
        }
 
        hace_dev->dev = &pdev->dev;
-       hace_dev->version = (unsigned long)hace_dev_id->data;
        hash_engine = &hace_dev->hash_engine;
        crypto_engine = &hace_dev->crypto_engine;