Skip to content

Commit

Permalink
crypto: squash lines for simple wrapper functions
Browse files Browse the repository at this point in the history
Remove unneeded variables and assignments.

Signed-off-by: Masahiro Yamada <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
  • Loading branch information
masahir0y authored and herbertx committed Sep 13, 2016
1 parent e9afc74 commit 36e09e1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 20 deletions.
5 changes: 1 addition & 4 deletions crypto/crct10dif_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,7 @@ static struct shash_alg alg = {

static int __init crct10dif_mod_init(void)
{
int ret;

ret = crypto_register_shash(&alg);
return ret;
return crypto_register_shash(&alg);
}

static void __exit crct10dif_mod_fini(void)
Expand Down
7 changes: 1 addition & 6 deletions crypto/mcryptd.c
Original file line number Diff line number Diff line change
Expand Up @@ -612,12 +612,7 @@ EXPORT_SYMBOL_GPL(mcryptd_alloc_ahash);

int ahash_mcryptd_digest(struct ahash_request *desc)
{
int err;

err = crypto_ahash_init(desc) ?:
ahash_mcryptd_finup(desc);

return err;
return crypto_ahash_init(desc) ?: ahash_mcryptd_finup(desc);
}

int ahash_mcryptd_update(struct ahash_request *desc)
Expand Down
12 changes: 2 additions & 10 deletions drivers/crypto/hifn_795x.c
Original file line number Diff line number Diff line change
Expand Up @@ -636,20 +636,12 @@ struct hifn_request_context {

static inline u32 hifn_read_0(struct hifn_device *dev, u32 reg)
{
u32 ret;

ret = readl(dev->bar[0] + reg);

return ret;
return readl(dev->bar[0] + reg);
}

static inline u32 hifn_read_1(struct hifn_device *dev, u32 reg)
{
u32 ret;

ret = readl(dev->bar[1] + reg);

return ret;
return readl(dev->bar[1] + reg);
}

static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
Expand Down

0 comments on commit 36e09e1

Please sign in to comment.