Commit 7d556931 authored by Corentin LABBE's avatar Corentin LABBE Committed by Herbert Xu

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: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent de915688
...@@ -975,11 +975,10 @@ static int omap_aes_get_res_of(struct omap_aes_dev *dd, ...@@ -975,11 +975,10 @@ static int omap_aes_get_res_of(struct omap_aes_dev *dd,
struct device *dev, struct resource *res) struct device *dev, struct resource *res)
{ {
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
const struct of_device_id *match;
int err = 0; int err = 0;
match = of_match_device(of_match_ptr(omap_aes_of_match), dev); dd->pdata = of_device_get_match_data(dev);
if (!match) { if (!dd->pdata) {
dev_err(dev, "no compatible OF match\n"); dev_err(dev, "no compatible OF match\n");
err = -EINVAL; err = -EINVAL;
goto err; goto err;
...@@ -992,8 +991,6 @@ static int omap_aes_get_res_of(struct omap_aes_dev *dd, ...@@ -992,8 +991,6 @@ static int omap_aes_get_res_of(struct omap_aes_dev *dd,
goto err; goto err;
} }
dd->pdata = match->data;
err: err:
return err; return err;
} }
......
...@@ -928,16 +928,13 @@ MODULE_DEVICE_TABLE(of, omap_des_of_match); ...@@ -928,16 +928,13 @@ MODULE_DEVICE_TABLE(of, omap_des_of_match);
static int omap_des_get_of(struct omap_des_dev *dd, static int omap_des_get_of(struct omap_des_dev *dd,
struct platform_device *pdev) struct platform_device *pdev)
{ {
const struct of_device_id *match;
match = of_match_device(of_match_ptr(omap_des_of_match), &pdev->dev); dd->pdata = of_device_get_match_data(&pdev->dev);
if (!match) { if (!dd->pdata) {
dev_err(&pdev->dev, "no compatible OF match\n"); dev_err(&pdev->dev, "no compatible OF match\n");
return -EINVAL; return -EINVAL;
} }
dd->pdata = match->data;
return 0; return 0;
} }
#else #else
......
...@@ -1944,11 +1944,10 @@ static int omap_sham_get_res_of(struct omap_sham_dev *dd, ...@@ -1944,11 +1944,10 @@ static int omap_sham_get_res_of(struct omap_sham_dev *dd,
struct device *dev, struct resource *res) struct device *dev, struct resource *res)
{ {
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
const struct of_device_id *match;
int err = 0; int err = 0;
match = of_match_device(of_match_ptr(omap_sham_of_match), dev); dd->pdata = of_device_get_match_data(dev);
if (!match) { if (!dd->pdata) {
dev_err(dev, "no compatible OF match\n"); dev_err(dev, "no compatible OF match\n");
err = -EINVAL; err = -EINVAL;
goto err; goto err;
...@@ -1968,8 +1967,6 @@ static int omap_sham_get_res_of(struct omap_sham_dev *dd, ...@@ -1968,8 +1967,6 @@ static int omap_sham_get_res_of(struct omap_sham_dev *dd,
goto err; goto err;
} }
dd->pdata = match->data;
err: err:
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment