diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2014-10-02 14:37:20 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-10-02 14:37:20 +0800 |
| commit | 9561dccb45a34f77001389824915e4dad8ede757 (patch) | |
| tree | a16454e64e00c3ea4e42719ecb3b1035da9c463b /include/linux | |
| parent | crypto: aesni - remove unused defines in "by8" variant (diff) | |
| parent | crypto: aesni - disable "by8" AVX CTR optimization (diff) | |
| download | linux-dev-9561dccb45a34f77001389824915e4dad8ede757.tar.xz linux-dev-9561dccb45a34f77001389824915e4dad8ede757.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merging the crypto tree for 3.17 to pull in the "by8" AVX CTR revert.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ccp.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/ccp.h b/include/linux/ccp.h index ebcc9d146219..7f437036baa4 100644 --- a/include/linux/ccp.h +++ b/include/linux/ccp.h @@ -27,6 +27,13 @@ struct ccp_cmd; defined(CONFIG_CRYPTO_DEV_CCP_DD_MODULE) /** + * ccp_present - check if a CCP device is present + * + * Returns zero if a CCP device is present, -ENODEV otherwise. + */ +int ccp_present(void); + +/** * ccp_enqueue_cmd - queue an operation for processing by the CCP * * @cmd: ccp_cmd struct to be processed @@ -53,6 +60,11 @@ int ccp_enqueue_cmd(struct ccp_cmd *cmd); #else /* CONFIG_CRYPTO_DEV_CCP_DD is not enabled */ +static inline int ccp_present(void) +{ + return -ENODEV; +} + static inline int ccp_enqueue_cmd(struct ccp_cmd *cmd) { return -ENODEV; |