Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/crypto/omap-aes.c

+2 −5
Original line number Diff line number Diff line
@@ -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;

}

drivers/crypto/omap-des.c

+2 −5
Original line number Diff line number Diff line
@@ -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

drivers/crypto/omap-sham.c

+2 −5
Original line number Diff line number Diff line
@@ -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;

}