[PATCH v2] crypto: drivers - remove of_match_ptr from OF match tables

Thorsten Blum posted 1 patch 1 week, 1 day ago
drivers/crypto/bcm/cipher.c | 6 +++---
drivers/crypto/qcom-rng.c   | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
[PATCH v2] crypto: drivers - remove of_match_ptr from OF match tables
Posted by Thorsten Blum 1 week, 1 day ago
Drop of_match_ptr() because OF matching is stubbed out when CONFIG_OF=n.

Indent bcm_spu_pdriver.driver and its members while at it.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
Changes in v2:
- Drop omap-des.c because it doesn't compile with CONFIG=n and requires
  other fixes first
- v1: https://lore.kernel.org/lkml/20260516114941.741140-2-thorsten.blum@linux.dev/
---
 drivers/crypto/bcm/cipher.c | 6 +++---
 drivers/crypto/qcom-rng.c   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/bcm/cipher.c b/drivers/crypto/bcm/cipher.c
index 2bce15dc0aa8..240b40ae9cd6 100644
--- a/drivers/crypto/bcm/cipher.c
+++ b/drivers/crypto/bcm/cipher.c
@@ -4698,9 +4698,9 @@ static void bcm_spu_remove(struct platform_device *pdev)
 
 static struct platform_driver bcm_spu_pdriver = {
 	.driver = {
-		   .name = "brcm-spu-crypto",
-		   .of_match_table = of_match_ptr(bcm_spu_dt_ids),
-		   },
+		.name = "brcm-spu-crypto",
+		.of_match_table = bcm_spu_dt_ids,
+	},
 	.probe = bcm_spu_probe,
 	.remove = bcm_spu_remove,
 };
diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c
index 0685ba122e8a..150e5802e351 100644
--- a/drivers/crypto/qcom-rng.c
+++ b/drivers/crypto/qcom-rng.c
@@ -265,7 +265,7 @@ static struct platform_driver qcom_rng_driver = {
 	.remove =  qcom_rng_remove,
 	.driver = {
 		.name = KBUILD_MODNAME,
-		.of_match_table = of_match_ptr(qcom_rng_of_match),
+		.of_match_table = qcom_rng_of_match,
 		.acpi_match_table = ACPI_PTR(qcom_rng_acpi_match),
 	}
 };
Re: [PATCH v2] crypto: drivers - remove of_match_ptr from OF match tables
Posted by Herbert Xu 2 days, 18 hours ago
On Sat, May 16, 2026 at 08:23:36PM +0200, Thorsten Blum wrote:
> Drop of_match_ptr() because OF matching is stubbed out when CONFIG_OF=n.
> 
> Indent bcm_spu_pdriver.driver and its members while at it.
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
> Changes in v2:
> - Drop omap-des.c because it doesn't compile with CONFIG=n and requires
>   other fixes first
> - v1: https://lore.kernel.org/lkml/20260516114941.741140-2-thorsten.blum@linux.dev/
> ---
>  drivers/crypto/bcm/cipher.c | 6 +++---
>  drivers/crypto/qcom-rng.c   | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt