crypto: omap - use of_device_get_match_data

The usage of of_device_get_match_data reduce the code size a bit.
Furthermore, it prevents an improbable dereference when
of_match_device() return NULL.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 1f3686a1ebfa4266799126273c2e96203c5a98b1..fbec0a2e76ddc7fc3d904de43ccbe5dd3ba5fced 100644 (file)
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -975,11 +975,10 @@ static int omap_aes_get_res_of(struct omap_aes_dev *dd,
                struct device *dev, struct resource *res)
 {
        struct device_node *node = dev->of_node;
-       const struct of_device_id *match;
        int err = 0;
 
-       match = of_match_device(of_match_ptr(omap_aes_of_match), dev);
-       if (!match) {
+       dd->pdata = of_device_get_match_data(dev);
+       if (!dd->pdata) {
                dev_err(dev, "no compatible OF match\n");
                err = -EINVAL;
                goto err;
@@ -992,8 +991,6 @@ static int omap_aes_get_res_of(struct omap_aes_dev *dd,
                goto err;
        }
 
-       dd->pdata = match->data;
-
 err:
        return err;
 }

diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index d37c9506c36c8cb4ab648af933d6d39e68cfaacc..ebc5c0f11f033dffdb5aa344d54d2046ec8f5f23 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

diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index c40ac30ec00262c247b06e1f07c2a7aab815a445..86b89ace836f56f69b706db40412961f42acbeac 100644 (file)
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -1944,11 +1944,10 @@ static int omap_sham_get_res_of(struct omap_sham_dev *dd,
                struct device *dev, struct resource *res)
 {
        struct device_node *node = dev->of_node;
-       const struct of_device_id *match;
        int err = 0;
 
-       match = of_match_device(of_match_ptr(omap_sham_of_match), dev);
-       if (!match) {
+       dd->pdata = of_device_get_match_data(dev);
+       if (!dd->pdata) {
                dev_err(dev, "no compatible OF match\n");
                err = -EINVAL;
                goto err;
@@ -1968,8 +1967,6 @@ static int omap_sham_get_res_of(struct omap_sham_dev *dd,
                goto err;
        }
 
-       dd->pdata = match->data;
-
 err:
        return err;
 }