Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 23:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: ccree: don't break lines unnecessarily

Browse Source 
These lines are less than 80 characters so we don't need to break them
up into chunks.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2018-01-11 13:10:11 +03:00 committed by Greg Kroah-Hartman
parent d0f40998dc
commit 4d61427603
7 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/ccree/cc_aead.c
View File

@ -2600,8 +2600,7 @@ static struct cc_crypto_alg *cc_create_aead_alg(struct cc_alg_template *tmpl,
alg = &tmpl->template_aead; alg = &tmpl->template_aead;
snprintf(alg->base.cra_name, CRYPTO_MAX_ALG_NAME, "%s", snprintf(alg->base.cra_name, CRYPTO_MAX_ALG_NAME, "%s", tmpl->name);
tmpl->name);
snprintf(alg->base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s", snprintf(alg->base.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
tmpl->driver_name); tmpl->driver_name);
alg->base.cra_module = THIS_MODULE; alg->base.cra_module = THIS_MODULE;

12
drivers/staging/ccree/cc_cipher.c
View File

@ -127,8 +127,7 @@ static int validate_data_size(struct cc_cipher_ctx *ctx_p,
static unsigned int get_max_keysize(struct crypto_tfm *tfm) static unsigned int get_max_keysize(struct crypto_tfm *tfm)
{ {
struct cc_crypto_alg *cc_alg = struct cc_crypto_alg *cc_alg =
container_of(tfm->__crt_alg, struct cc_crypto_alg, container_of(tfm->__crt_alg, struct cc_crypto_alg, crypto_alg);
crypto_alg);
if ((cc_alg->crypto_alg.cra_flags & CRYPTO_ALG_TYPE_MASK) == if ((cc_alg->crypto_alg.cra_flags & CRYPTO_ALG_TYPE_MASK) ==
CRYPTO_ALG_TYPE_ABLKCIPHER) CRYPTO_ALG_TYPE_ABLKCIPHER)
@ -391,8 +390,7 @@ static void cc_setup_cipher_desc(struct crypto_tfm *tfm,
unsigned int du_size = nbytes; unsigned int du_size = nbytes;
struct cc_crypto_alg *cc_alg = struct cc_crypto_alg *cc_alg =
container_of(tfm->__crt_alg, struct cc_crypto_alg, container_of(tfm->__crt_alg, struct cc_crypto_alg, crypto_alg);
crypto_alg);
if ((cc_alg->crypto_alg.cra_flags & CRYPTO_ALG_BULK_MASK) == if ((cc_alg->crypto_alg.cra_flags & CRYPTO_ALG_BULK_MASK) ==
CRYPTO_ALG_BULK_DU_512) CRYPTO_ALG_BULK_DU_512)
@ -611,8 +609,7 @@ static void cc_cipher_complete(struct device *dev, void *cc_req, int err)
kfree(req_ctx->backup_info); kfree(req_ctx->backup_info);
} else if (!err) { } else if (!err) {
scatterwalk_map_and_copy(req->info, req->dst, scatterwalk_map_and_copy(req->info, req->dst,
(req->nbytes - ivsize), (req->nbytes - ivsize), ivsize, 0);
ivsize, 0);
} }
ablkcipher_request_complete(areq, err); ablkcipher_request_complete(areq, err);
@ -1096,8 +1093,7 @@ struct cc_crypto_alg *cc_cipher_create_alg(struct cc_alg_template *template,
int cc_cipher_free(struct cc_drvdata *drvdata) int cc_cipher_free(struct cc_drvdata *drvdata)
{ {
struct cc_crypto_alg *t_alg, *n; struct cc_crypto_alg *t_alg, *n;
struct cc_cipher_handle *blkcipher_handle = struct cc_cipher_handle *blkcipher_handle = drvdata->blkcipher_handle;
drvdata->blkcipher_handle;
if (blkcipher_handle) { if (blkcipher_handle) {
/* Remove registered algs */ /* Remove registered algs */
list_for_each_entry_safe(t_alg, n, list_for_each_entry_safe(t_alg, n,

3
drivers/staging/ccree/cc_driver.c
View File

@ -216,8 +216,7 @@ static int init_cc_resources(struct platform_device *plat_dev)
} }
if (rc) { if (rc) {
dev_err(dev, "Failed in dma_set_mask, mask=%par\n", dev_err(dev, "Failed in dma_set_mask, mask=%par\n", &dma_mask);
&dma_mask);
return rc; return rc;
} }

3
drivers/staging/ccree/cc_fips.c
View File

@ -53,8 +53,7 @@ void cc_fips_fini(struct cc_drvdata *drvdata)
void fips_handler(struct cc_drvdata *drvdata) void fips_handler(struct cc_drvdata *drvdata)
{ {
struct cc_fips_handle *fips_handle_ptr = struct cc_fips_handle *fips_handle_ptr = drvdata->fips_handle;
drvdata->fips_handle;
tasklet_schedule(&fips_handle_ptr->tasklet); tasklet_schedule(&fips_handle_ptr->tasklet);
} }

8
drivers/staging/ccree/cc_hash.c
View File

@ -1858,9 +1858,8 @@ int cc_init_hash_sram(struct cc_drvdata *drvdata)
hash_handle->larval_digest_sram_addr = sram_buff_ofs; hash_handle->larval_digest_sram_addr = sram_buff_ofs;
/* Copy-to-sram initial SHA* digests */ /* Copy-to-sram initial SHA* digests */
cc_set_sram_desc(md5_init, sram_buff_ofs, cc_set_sram_desc(md5_init, sram_buff_ofs, ARRAY_SIZE(md5_init),
ARRAY_SIZE(md5_init), larval_seq, larval_seq, &larval_seq_len);
&larval_seq_len);
rc = send_request_init(drvdata, larval_seq, larval_seq_len); rc = send_request_init(drvdata, larval_seq, larval_seq_len);
if (rc) if (rc)
goto init_digest_const_err; goto init_digest_const_err;
@ -2004,8 +2003,7 @@ int cc_hash_alloc(struct cc_drvdata *drvdata)
kfree(t_alg); kfree(t_alg);
goto fail; goto fail;
} else { } else {
list_add_tail(&t_alg->entry, list_add_tail(&t_alg->entry, &hash_handle->hash_list);
&hash_handle->hash_list);
} }
if (hw_mode == DRV_CIPHER_XCBC_MAC || if (hw_mode == DRV_CIPHER_XCBC_MAC ||

3
drivers/staging/ccree/cc_pm.c
View File

@ -28,8 +28,7 @@ int cc_pm_suspend(struct device *dev)
cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_ENABLE); cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_ENABLE);
rc = cc_suspend_req_queue(drvdata); rc = cc_suspend_req_queue(drvdata);
if (rc) { if (rc) {
dev_err(dev, "cc_suspend_req_queue (%x)\n", dev_err(dev, "cc_suspend_req_queue (%x)\n", rc);
rc);
return rc; return rc;
} }
fini_cc_regs(drvdata); fini_cc_regs(drvdata);

3
drivers/staging/ccree/cc_request_mgr.c
View File

@ -275,8 +275,7 @@ static int cc_do_send_request(struct cc_drvdata *drvdata,
/* Acquire IV from pool */ /* Acquire IV from pool */
rc = cc_get_iv(drvdata, cc_req->ivgen_dma_addr, rc = cc_get_iv(drvdata, cc_req->ivgen_dma_addr,
cc_req->ivgen_dma_addr_len, cc_req->ivgen_dma_addr_len,
cc_req->ivgen_size, cc_req->ivgen_size, iv_seq, &iv_seq_len);
iv_seq, &iv_seq_len);
if (rc) { if (rc) {
dev_err(dev, "Failed to generate IV (rc=%d)\n", rc); dev_err(dev, "Failed to generate IV (rc=%d)\n", rc);