Merge branch 'acpi-ec' into acpi

[platform/kernel/linux-starfive.git] / drivers / crypto / omap-des.c

diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index d37c950..ebc5c0f 100644 (file)
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -928,16 +928,13 @@ MODULE_DEVICE_TABLE(of, omap_des_of_match);
 static int omap_des_get_of(struct omap_des_dev *dd,
                struct platform_device *pdev)
 {
-       const struct of_device_id *match;
 
-       match = of_match_device(of_match_ptr(omap_des_of_match), &pdev->dev);
-       if (!match) {
+       dd->pdata = of_device_get_match_data(&pdev->dev);
+       if (!dd->pdata) {
                dev_err(&pdev->dev, "no compatible OF match\n");
                return -EINVAL;
        }
 
-       dd->pdata = match->data;
-
        return 0;
 }
 #else