crypto: picoxcell - Remove spacc_is_compatible() wrapper function

The function is used to check either the platform device ID name or the OF
node's compatible (depending how the device was registered) to know which
device type was registered.

But the driver is for a DT-only platform and so there's no need for this
level of indirection since the devices can only be registered via OF.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c
index 539effb..b6f1484 100644 (file)
--- a/drivers/crypto/picoxcell_crypto.c
+++ b/drivers/crypto/picoxcell_crypto.c
@@ -1616,32 +1616,17 @@ static const struct of_device_id spacc_of_id_table[] = {
 MODULE_DEVICE_TABLE(of, spacc_of_id_table);
 #endif /* CONFIG_OF */
 
-static bool spacc_is_compatible(struct platform_device *pdev,
-                               const char *spacc_type)
-{
-       const struct platform_device_id *platid = platform_get_device_id(pdev);
-
-       if (platid && !strcmp(platid->name, spacc_type))
-               return true;
-
-#ifdef CONFIG_OF
-       if (of_device_is_compatible(pdev->dev.of_node, spacc_type))
-               return true;
-#endif /* CONFIG_OF */
-
-       return false;
-}
-
 static int spacc_probe(struct platform_device *pdev)
 {
        int i, err, ret = -EINVAL;
        struct resource *mem, *irq;
+       struct device_node *np = pdev->dev.of_node;
        struct spacc_engine *engine = devm_kzalloc(&pdev->dev, sizeof(*engine),
                                                   GFP_KERNEL);
        if (!engine)
                return -ENOMEM;
 
-       if (spacc_is_compatible(pdev, "picochip,spacc-ipsec")) {
+       if (of_device_is_compatible(np, "picochip,spacc-ipsec")) {
                engine->max_ctxs        = SPACC_CRYPTO_IPSEC_MAX_CTXS;
                engine->cipher_pg_sz    = SPACC_CRYPTO_IPSEC_CIPHER_PG_SZ;
                engine->hash_pg_sz      = SPACC_CRYPTO_IPSEC_HASH_PG_SZ;
@@ -1650,7 +1635,7 @@ static int spacc_probe(struct platform_device *pdev)
                engine->num_algs        = ARRAY_SIZE(ipsec_engine_algs);
                engine->aeads           = ipsec_engine_aeads;
                engine->num_aeads       = ARRAY_SIZE(ipsec_engine_aeads);
-       } else if (spacc_is_compatible(pdev, "picochip,spacc-l2")) {
+       } else if (of_device_is_compatible(np, "picochip,spacc-l2")) {
                engine->max_ctxs        = SPACC_CRYPTO_L2_MAX_CTXS;
                engine->cipher_pg_sz    = SPACC_CRYPTO_L2_CIPHER_PG_SZ;
                engine->hash_pg_sz      = SPACC_CRYPTO_L2_HASH_PG_SZ;