Skip to contentSkip to conversation

crypto: drivers - remove of_match_ptr from OF match tables

PATCH In review Thorsten Blum 2 participants 2 messages May 16 – May 22

Subsystems (2)
Arm Qualcomm mailing list Crypto API
lore
Share & tools
lore

Thorsten Blum

author
#0 lore raw

PATCH v2 1/1 crypto: drivers - remove of_match_ptr from OF match tables

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 <[email protected]>

---
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/[email protected]/

---
 drivers/crypto/bcm/cipher.c | 6 +++---
 drivers/crypto/qcom-rng.c   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/crypto/bcm/cipher.c +3 -3
index 2bce15dc0aa8..240b40ae9cd6 100644
@@ -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,
 };
drivers/crypto/qcom-rng.c +1 -1
index 0685ba122e8a..150e5802e351 100644
@@ -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),
 	}
 };
maintainer
#1 lore raw
Quoted 10 lines · Thorsten Blum

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 <[email protected]>

---
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/[email protected]/

Quoted 4 lines
---
 drivers/crypto/bcm/cipher.c | 6 +++---
 drivers/crypto/qcom-rng.c   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt