mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-23 05:56:14 -04:00
crypto: cavium/zip - drop obsolete 'comp' implementation
The 'comp' API is obsolete and will be removed, so remove this comp implementation. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
committed by
Herbert Xu
parent
8beb40458c
commit
bd40bf1ad2
@@ -371,36 +371,6 @@ static struct pci_driver zip_driver = {
|
||||
|
||||
/* Kernel Crypto Subsystem Interface */
|
||||
|
||||
static struct crypto_alg zip_comp_deflate = {
|
||||
.cra_name = "deflate",
|
||||
.cra_driver_name = "deflate-cavium",
|
||||
.cra_flags = CRYPTO_ALG_TYPE_COMPRESS,
|
||||
.cra_ctxsize = sizeof(struct zip_kernel_ctx),
|
||||
.cra_priority = 300,
|
||||
.cra_module = THIS_MODULE,
|
||||
.cra_init = zip_alloc_comp_ctx_deflate,
|
||||
.cra_exit = zip_free_comp_ctx,
|
||||
.cra_u = { .compress = {
|
||||
.coa_compress = zip_comp_compress,
|
||||
.coa_decompress = zip_comp_decompress
|
||||
} }
|
||||
};
|
||||
|
||||
static struct crypto_alg zip_comp_lzs = {
|
||||
.cra_name = "lzs",
|
||||
.cra_driver_name = "lzs-cavium",
|
||||
.cra_flags = CRYPTO_ALG_TYPE_COMPRESS,
|
||||
.cra_ctxsize = sizeof(struct zip_kernel_ctx),
|
||||
.cra_priority = 300,
|
||||
.cra_module = THIS_MODULE,
|
||||
.cra_init = zip_alloc_comp_ctx_lzs,
|
||||
.cra_exit = zip_free_comp_ctx,
|
||||
.cra_u = { .compress = {
|
||||
.coa_compress = zip_comp_compress,
|
||||
.coa_decompress = zip_comp_decompress
|
||||
} }
|
||||
};
|
||||
|
||||
static struct scomp_alg zip_scomp_deflate = {
|
||||
.alloc_ctx = zip_alloc_scomp_ctx_deflate,
|
||||
.free_ctx = zip_free_scomp_ctx,
|
||||
@@ -431,22 +401,10 @@ static int zip_register_compression_device(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = crypto_register_alg(&zip_comp_deflate);
|
||||
if (ret < 0) {
|
||||
zip_err("Deflate algorithm registration failed\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = crypto_register_alg(&zip_comp_lzs);
|
||||
if (ret < 0) {
|
||||
zip_err("LZS algorithm registration failed\n");
|
||||
goto err_unregister_alg_deflate;
|
||||
}
|
||||
|
||||
ret = crypto_register_scomp(&zip_scomp_deflate);
|
||||
if (ret < 0) {
|
||||
zip_err("Deflate scomp algorithm registration failed\n");
|
||||
goto err_unregister_alg_lzs;
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = crypto_register_scomp(&zip_scomp_lzs);
|
||||
@@ -459,18 +417,12 @@ static int zip_register_compression_device(void)
|
||||
|
||||
err_unregister_scomp_deflate:
|
||||
crypto_unregister_scomp(&zip_scomp_deflate);
|
||||
err_unregister_alg_lzs:
|
||||
crypto_unregister_alg(&zip_comp_lzs);
|
||||
err_unregister_alg_deflate:
|
||||
crypto_unregister_alg(&zip_comp_deflate);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void zip_unregister_compression_device(void)
|
||||
{
|
||||
crypto_unregister_alg(&zip_comp_deflate);
|
||||
crypto_unregister_alg(&zip_comp_lzs);
|
||||
crypto_unregister_scomp(&zip_scomp_deflate);
|
||||
crypto_unregister_scomp(&zip_scomp_lzs);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user