| Message ID | 20171027015342.6345-1-stephen@brennan.io (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
On Thu, Oct 26, 2017 at 06:53:42PM -0700, Stephen Brennan wrote: > In particular, fixes some over-indented if statement bodies as well as a > couple lines indented with spaces. checkpatch.pl now reports no warnings > on this file other than 80 character warnings. > > Signed-off-by: Stephen Brennan <stephen@brennan.io> > --- > Hello again, hoping these indentation issues are a bit more actionable than the > line length errors I was trying to fix in my previous patch. Again, thanks in > advance for taking the time to look! > > drivers/staging/ccree/ssi_buffer_mgr.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/staging/ccree/ssi_buffer_mgr.c b/drivers/staging/ccree/ssi_buffer_mgr.c > index dca3ce84d043..7c62255128d5 100644 > --- a/drivers/staging/ccree/ssi_buffer_mgr.c > +++ b/drivers/staging/ccree/ssi_buffer_mgr.c > @@ -406,8 +406,8 @@ ssi_aead_handle_config_buf(struct device *dev, > sg_init_one(&areq_ctx->ccm_adata_sg, config_data, AES_BLOCK_SIZE + areq_ctx->ccm_hdr_size); > if (unlikely(dma_map_sg(dev, &areq_ctx->ccm_adata_sg, 1, > DMA_TO_DEVICE) != 1)) { > - dev_err(dev, "dma_map_sg() config buffer failed\n"); > - return -ENOMEM; > + dev_err(dev, "dma_map_sg() config buffer failed\n"); > + return -ENOMEM; > } > dev_dbg(dev, "Mapped curr_buff: dma_address=%pad page=%p addr=%pK offset=%u length=%u\n", > &sg_dma_address(&areq_ctx->ccm_adata_sg), > @@ -435,8 +435,8 @@ static inline int ssi_ahash_handle_curr_buf(struct device *dev, > sg_init_one(areq_ctx->buff_sg, curr_buff, curr_buff_cnt); > if (unlikely(dma_map_sg(dev, areq_ctx->buff_sg, 1, > DMA_TO_DEVICE) != 1)) { > - dev_err(dev, "dma_map_sg() src buffer failed\n"); > - return -ENOMEM; > + dev_err(dev, "dma_map_sg() src buffer failed\n"); > + return -ENOMEM; So far so good. > } > dev_dbg(dev, "Mapped curr_buff: dma_address=%pad page=%p addr=%pK offset=%u length=%u\n", > &sg_dma_address(areq_ctx->buff_sg), sg_page(areq_ctx->buff_sg), > @@ -1029,10 +1029,10 @@ static inline int ssi_buffer_mgr_prepare_aead_data_mlli( > * verification is made by CPU compare in order to simplify > * MAC verification upon request completion > */ > - u32 size_to_skip = req->assoclen; > + u32 size_to_skip = req->assoclen; > > - if (areq_ctx->is_gcm4543) > - size_to_skip += crypto_aead_ivsize(tfm); > + if (areq_ctx->is_gcm4543) > + size_to_skip += crypto_aead_ivsize(tfm); > > ssi_buffer_mgr_copy_scatterlist_portion( > dev, areq_ctx->backup_mac, req->src, But then ssi_buffer_mgr_copy_scatterlist_portion() is still not indented correctly. regards, dan carpenter
On Fri, 2017-10-27 at 11:32 +0300, Dan Carpenter wrote: > On Thu, Oct 26, 2017 at 06:53:42PM -0700, Stephen Brennan wrote: > > In particular, fixes some over-indented if statement bodies as well as a > > couple lines indented with spaces. checkpatch.pl now reports no warnings > > on this file other than 80 character warnings. [] > > diff --git a/drivers/staging/ccree/ssi_buffer_mgr.c b/drivers/staging/ccree/ssi_buffer_mgr.c [] > > @@ -1029,10 +1029,10 @@ static inline int ssi_buffer_mgr_prepare_aead_data_mlli( > > * verification is made by CPU compare in order to simplify > > * MAC verification upon request completion > > */ > > - u32 size_to_skip = req->assoclen; > > + u32 size_to_skip = req->assoclen; > > > > - if (areq_ctx->is_gcm4543) > > - size_to_skip += crypto_aead_ivsize(tfm); > > + if (areq_ctx->is_gcm4543) > > + size_to_skip += crypto_aead_ivsize(tfm); > > > > ssi_buffer_mgr_copy_scatterlist_portion( > > dev, areq_ctx->backup_mac, req->src, > > But then ssi_buffer_mgr_copy_scatterlist_portion() is still not indented > correctly. The latest version of checkpatch should bleat something on the ...scatterlist_portion( line
On Fri, Oct 27, 2017 at 07:23:58AM -0700, Joe Perches wrote: > On Fri, 2017-10-27 at 11:32 +0300, Dan Carpenter wrote: > > But then ssi_buffer_mgr_copy_scatterlist_portion() is still not indented > > correctly. Yeah, I don't know how I missed it. I'll send a new version of the patch out momentarily. > The latest version of checkpatch should bleat something on the > ...scatterlist_portion( > line Strangely, my checkpatch doesn't complain about it, but I guess you can't always rely on tools for this stuff. For reference, I'm currently on the 10/18 linux-next branch.
diff --git a/drivers/staging/ccree/ssi_buffer_mgr.c b/drivers/staging/ccree/ssi_buffer_mgr.c index dca3ce84d043..7c62255128d5 100644 --- a/drivers/staging/ccree/ssi_buffer_mgr.c +++ b/drivers/staging/ccree/ssi_buffer_mgr.c @@ -406,8 +406,8 @@ ssi_aead_handle_config_buf(struct device *dev, sg_init_one(&areq_ctx->ccm_adata_sg, config_data, AES_BLOCK_SIZE + areq_ctx->ccm_hdr_size); if (unlikely(dma_map_sg(dev, &areq_ctx->ccm_adata_sg, 1, DMA_TO_DEVICE) != 1)) { - dev_err(dev, "dma_map_sg() config buffer failed\n"); - return -ENOMEM; + dev_err(dev, "dma_map_sg() config buffer failed\n"); + return -ENOMEM; } dev_dbg(dev, "Mapped curr_buff: dma_address=%pad page=%p addr=%pK offset=%u length=%u\n", &sg_dma_address(&areq_ctx->ccm_adata_sg), @@ -435,8 +435,8 @@ static inline int ssi_ahash_handle_curr_buf(struct device *dev, sg_init_one(areq_ctx->buff_sg, curr_buff, curr_buff_cnt); if (unlikely(dma_map_sg(dev, areq_ctx->buff_sg, 1, DMA_TO_DEVICE) != 1)) { - dev_err(dev, "dma_map_sg() src buffer failed\n"); - return -ENOMEM; + dev_err(dev, "dma_map_sg() src buffer failed\n"); + return -ENOMEM; } dev_dbg(dev, "Mapped curr_buff: dma_address=%pad page=%p addr=%pK offset=%u length=%u\n", &sg_dma_address(areq_ctx->buff_sg), sg_page(areq_ctx->buff_sg), @@ -1029,10 +1029,10 @@ static inline int ssi_buffer_mgr_prepare_aead_data_mlli( * verification is made by CPU compare in order to simplify * MAC verification upon request completion */ - u32 size_to_skip = req->assoclen; + u32 size_to_skip = req->assoclen; - if (areq_ctx->is_gcm4543) - size_to_skip += crypto_aead_ivsize(tfm); + if (areq_ctx->is_gcm4543) + size_to_skip += crypto_aead_ivsize(tfm); ssi_buffer_mgr_copy_scatterlist_portion( dev, areq_ctx->backup_mac, req->src,
In particular, fixes some over-indented if statement bodies as well as a couple lines indented with spaces. checkpatch.pl now reports no warnings on this file other than 80 character warnings. Signed-off-by: Stephen Brennan <stephen@brennan.io> --- Hello again, hoping these indentation issues are a bit more actionable than the line length errors I was trying to fix in my previous patch. Again, thanks in advance for taking the time to look! drivers/staging/ccree/ssi_buffer_mgr.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)