[PATCH 5/6] crypto: ccp - Simplify with of_device_get_match_data()

Krzysztof Kozlowski posted 6 patches 1 month, 1 week ago
There is a newer version of this series
[PATCH 5/6] crypto: ccp - Simplify with of_device_get_match_data()
Posted by Krzysztof Kozlowski 1 month, 1 week ago
Driver's probe function matches against driver's of_device_id table,
where each entry has non-NULL match data, so of_match_node() can be
simplified with of_device_get_match_data().

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/crypto/ccp/sp-platform.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/crypto/ccp/sp-platform.c b/drivers/crypto/ccp/sp-platform.c
index de8a8183efdb..3f9843fa7782 100644
--- a/drivers/crypto/ccp/sp-platform.c
+++ b/drivers/crypto/ccp/sp-platform.c
@@ -52,17 +52,6 @@ static const struct of_device_id sp_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, sp_of_match);
 
-static struct sp_dev_vdata *sp_get_of_version(struct platform_device *pdev)
-{
-	const struct of_device_id *match;
-
-	match = of_match_node(sp_of_match, pdev->dev.of_node);
-	if (match && match->data)
-		return (struct sp_dev_vdata *)match->data;
-
-	return NULL;
-}
-
 static const struct sp_dev_vdata *sp_get_acpi_version(struct platform_device *pdev)
 {
 	const struct acpi_device_id *match;
@@ -123,7 +112,7 @@ static int sp_platform_probe(struct platform_device *pdev)
 		goto e_err;
 
 	sp->dev_specific = sp_platform;
-	sp->dev_vdata = pdev->dev.of_node ? sp_get_of_version(pdev)
+	sp->dev_vdata = pdev->dev.of_node ? of_device_get_match_data(&pdev->dev)
 					 : sp_get_acpi_version(pdev);
 	if (!sp->dev_vdata) {
 		ret = -ENODEV;

-- 
2.48.1
Re: [PATCH 5/6] crypto: ccp - Simplify with of_device_get_match_data()
Posted by Tom Lendacky 1 month, 1 week ago
On 11/6/25 10:31, Krzysztof Kozlowski wrote:
> Driver's probe function matches against driver's of_device_id table,
> where each entry has non-NULL match data, so of_match_node() can be
> simplified with of_device_get_match_data().
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Acked-by: Tom Lendacky <thomas.lendacky@amd.com>

> ---
>  drivers/crypto/ccp/sp-platform.c | 13 +------------
>  1 file changed, 1 insertion(+), 12 deletions(-)
> 
> diff --git a/drivers/crypto/ccp/sp-platform.c b/drivers/crypto/ccp/sp-platform.c
> index de8a8183efdb..3f9843fa7782 100644
> --- a/drivers/crypto/ccp/sp-platform.c
> +++ b/drivers/crypto/ccp/sp-platform.c
> @@ -52,17 +52,6 @@ static const struct of_device_id sp_of_match[] = {
>  };
>  MODULE_DEVICE_TABLE(of, sp_of_match);
>  
> -static struct sp_dev_vdata *sp_get_of_version(struct platform_device *pdev)
> -{
> -	const struct of_device_id *match;
> -
> -	match = of_match_node(sp_of_match, pdev->dev.of_node);
> -	if (match && match->data)
> -		return (struct sp_dev_vdata *)match->data;
> -
> -	return NULL;
> -}
> -
>  static const struct sp_dev_vdata *sp_get_acpi_version(struct platform_device *pdev)
>  {
>  	const struct acpi_device_id *match;
> @@ -123,7 +112,7 @@ static int sp_platform_probe(struct platform_device *pdev)
>  		goto e_err;
>  
>  	sp->dev_specific = sp_platform;
> -	sp->dev_vdata = pdev->dev.of_node ? sp_get_of_version(pdev)
> +	sp->dev_vdata = pdev->dev.of_node ? of_device_get_match_data(&pdev->dev)
>  					 : sp_get_acpi_version(pdev);
>  	if (!sp->dev_vdata) {
>  		ret = -ENODEV;
>