diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-03-14 06:16:58 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-03-22 06:13:55 -0400 |
commit | 5cec26e9843e4f16974e5a30a3ffada1557b661d (patch) | |
tree | 31fba7fba3c9e25d5d153c178384c20fa2f78504 /drivers/crypto/picoxcell_crypto.c | |
parent | 264878e6a7eb02841100beb0d999987ef3b5e17f (diff) |
crypto: picoxcell - Use of_match_ptr() macro
This eliminates having an #ifdef returning NULL for the case
when OF is disabled.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/picoxcell_crypto.c')
-rw-r--r-- | drivers/crypto/picoxcell_crypto.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c index 2096d4685a9e..ac30724d923d 100644 --- a/drivers/crypto/picoxcell_crypto.c +++ b/drivers/crypto/picoxcell_crypto.c | |||
@@ -1688,8 +1688,6 @@ static const struct of_device_id spacc_of_id_table[] = { | |||
1688 | { .compatible = "picochip,spacc-l2" }, | 1688 | { .compatible = "picochip,spacc-l2" }, |
1689 | {} | 1689 | {} |
1690 | }; | 1690 | }; |
1691 | #else /* CONFIG_OF */ | ||
1692 | #define spacc_of_id_table NULL | ||
1693 | #endif /* CONFIG_OF */ | 1691 | #endif /* CONFIG_OF */ |
1694 | 1692 | ||
1695 | static bool spacc_is_compatible(struct platform_device *pdev, | 1693 | static bool spacc_is_compatible(struct platform_device *pdev, |
@@ -1874,7 +1872,7 @@ static struct platform_driver spacc_driver = { | |||
1874 | #ifdef CONFIG_PM | 1872 | #ifdef CONFIG_PM |
1875 | .pm = &spacc_pm_ops, | 1873 | .pm = &spacc_pm_ops, |
1876 | #endif /* CONFIG_PM */ | 1874 | #endif /* CONFIG_PM */ |
1877 | .of_match_table = spacc_of_id_table, | 1875 | .of_match_table = of_match_ptr(spacc_of_id_table), |
1878 | }, | 1876 | }, |
1879 | .id_table = spacc_id_table, | 1877 | .id_table = spacc_id_table, |
1880 | }; | 1878 | }; |